Merge pull request #6581 from STEllAR-GROUP/fixing_6579

Attempting to work around a Boost.Spirit problem
STEllAR-GROUP · Dec 2, 2024 · af30739 · af30739
2 parents f711e41 + 339fe48
commit af30739
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 0 deletions.
diff --git a/components/performance_counters/io/CMakeLists.txt b/components/performance_counters/io/CMakeLists.txt
@@ -28,6 +28,11 @@ if(HPX_WITH_IO_COUNTERS)
     SOURCES ${io_counters_sources} ${HPX_WITH_UNITY_BUILD_OPTION}
   )
 
+  # see #6579
+  if(MSVC AND Boost_VERSION_STRING VERSION_LESS "1.79.0")
+    target_compile_definitions(io_counters_component PRIVATE NOMINMAX)
+  endif()
+
   add_hpx_pseudo_dependencies(
     components.performance_counters.io io_counters_component
   )

diff --git a/components/performance_counters/memory_counters/CMakeLists.txt b/components/performance_counters/memory_counters/CMakeLists.txt
@@ -38,6 +38,11 @@ add_hpx_component(
   SOURCES ${memory_sources} ${HPX_WITH_UNITY_BUILD_OPTION}
 )
 
+# see #6579
+if(MSVC AND Boost_VERSION_STRING VERSION_LESS "1.79.0")
+  target_compile_definitions(memory_counters_component PRIVATE NOMINMAX)
+endif()
+
 add_hpx_pseudo_dependencies(
   components.performance_counters.memory_counters memory_counters_component
 )

diff --git a/examples/jacobi_smp/CMakeLists.txt b/examples/jacobi_smp/CMakeLists.txt
@@ -47,6 +47,11 @@ foreach(jacobi_smp_application ${jacobi_smp_applications})
     FOLDER "Examples/JacobiSMP"
   )
 
+  # see #6579
+  if(Boost_VERSION_STRING VERSION_LESS "1.79.0")
+    target_compile_definitions(${jacobi_smp_application} PRIVATE NOMINMAX)
+  endif()
+
   add_hpx_example_target_dependencies("jacobi_smp" ${jacobi_smp_application})
 
   if(HPX_WITH_TESTS

diff --git a/libs/core/affinity/CMakeLists.txt b/libs/core/affinity/CMakeLists.txt
@@ -40,3 +40,8 @@ add_hpx_module(
   DEPENDENCIES Hwloc::hwloc
   CMAKE_SUBDIRS tests
 )
+
+# see #6579
+if(MSVC AND Boost_VERSION_STRING VERSION_LESS "1.79.0")
+  target_compile_definitions(hpx_affinity PRIVATE NOMINMAX)
+endif()
diff --git a/libs/core/batch_environments/CMakeLists.txt b/libs/core/batch_environments/CMakeLists.txt
@@ -46,3 +46,8 @@ add_hpx_module(
     hpx_type_support
   CMAKE_SUBDIRS examples tests
 )
+
+# see #6579
+if(MSVC AND Boost_VERSION_STRING VERSION_LESS "1.79.0")
+  target_compile_definitions(hpx_batch_environments PRIVATE NOMINMAX)
+endif()
diff --git a/libs/full/performance_counters/CMakeLists.txt b/libs/full/performance_counters/CMakeLists.txt
@@ -105,3 +105,8 @@ add_hpx_module(
     hpx_statistics
   CMAKE_SUBDIRS examples tests
 )
+
+# see #6579
+if(MSVC AND Boost_VERSION_STRING VERSION_LESS "1.79.0")
+  target_compile_definitions(hpx_performance_counters PRIVATE NOMINMAX)
+endif()