Making optional all Boost specific configuration constants

STEllAR-GROUP · May 25, 2017 · 6941187 · 6941187
1 parent 744467f
commit 6941187
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1216,12 +1216,12 @@ if(WIN32)
   # Boost
   ##############################################################################
 
-  hpx_add_config_define(BOOST_USE_WINDOWS_H)
+  hpx_add_config_cond_define(BOOST_USE_WINDOWS_H)
   if (NOT Boost_USE_STATIC_LIBS)
-    hpx_add_config_define(BOOST_SERIALIZATION_DYN_LINK)
+    hpx_add_config_cond_define(BOOST_SERIALIZATION_DYN_LINK)
   endif()
   if(NOT CMAKE_CL_64)
-    hpx_add_config_define(BOOST_NO_ALIGNMENT)
+    hpx_add_config_cond_define(BOOST_NO_ALIGNMENT)
   endif()
   if(NOT HPX_WITH_GENERIC_CONTEXT_COROUTINES)
     hpx_add_config_define(HPX_HAVE_FIBER_BASED_COROUTINES)

diff --git a/cmake/HPX_PerformCxxFeatureTests.cmake b/cmake/HPX_PerformCxxFeatureTests.cmake
@@ -22,7 +22,7 @@ macro(hpx_perform_cxx_feature_tests)
 
   hpx_check_for_cxx11_decltype(
     REQUIRED "HPX needs support for C++11 decltype")
-  hpx_add_config_define(BOOST_RESULT_OF_USE_DECLTYPE)
+  hpx_add_config_cond_define(BOOST_RESULT_OF_USE_DECLTYPE)
 
   hpx_check_for_cxx11_sfinae_expression(
     DEFINITIONS HPX_HAVE_CXX11_SFINAE_EXPRESSION)

diff --git a/cmake/HPX_SetupBoost.cmake b/cmake/HPX_SetupBoost.cmake
@@ -126,25 +126,25 @@ if(HPX_PLATFORM_UC STREQUAL "XEONPHI")
 endif()
 
 # Boost preprocessor definitions
-hpx_add_config_define(BOOST_PARAMETER_MAX_ARITY 7)
+hpx_add_config_cond_define(BOOST_PARAMETER_MAX_ARITY 7)
 if(MSVC)
   hpx_option(HPX_WITH_BOOST_ALL_DYNAMIC_LINK BOOL
     "Add BOOST_ALL_DYN_LINK to compile flags (default: OFF)"
     OFF ADVANCED)
   if (HPX_WITH_BOOST_ALL_DYNAMIC_LINK OR HPX_WITH_VCPKG)
     set(HPX_WITH_BOOST_ALL_DYNAMIC_LINK ON)
-    hpx_add_config_define(BOOST_ALL_DYN_LINK)
+    hpx_add_config_cond_define(BOOST_ALL_DYN_LINK)
   endif()
 else()
   hpx_add_config_define(HPX_COROUTINE_NO_SEPARATE_CALL_SITES)
 endif()
 hpx_add_config_define(HPX_HAVE_LOG_NO_TSS)
 hpx_add_config_define(HPX_HAVE_LOG_NO_TS)
-hpx_add_config_define(BOOST_BIGINT_HAS_NATIVE_INT64)
+hpx_add_config_cond_define(BOOST_BIGINT_HAS_NATIVE_INT64)
 
 # Disable usage of std::atomics in lockfree
 if(Boost_VERSION LESS 105300)
-  hpx_add_config_define(BOOST_NO_0X_HDR_ATOMIC)
+  hpx_add_config_cond_define(BOOST_NO_0X_HDR_ATOMIC)
 endif()
 
 include_directories(SYSTEM ${Boost_INCLUDE_DIRS})