diff --git a/components/performance_counters/io/CMakeLists.txt b/components/performance_counters/io/CMakeLists.txt index 623a0ff03b9c..7d0996d8521b 100644 --- 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 index ffd466045ec7..0ce79a842f6b 100644 --- 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 index e951e11a5e1a..ea2ceba2b9ef 100644 --- 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 index 51c636eb7a83..ef1cb887b41f 100644 --- 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 index ab6599943813..3fcc0f56dc79 100644 --- 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 index bfc14469b085..e41650a85461 100644 --- 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()