minor CMake refactoring

softwareQinc · Sep 4, 2023 · 607f063 · 607f063
1 parent 8b5ed53
commit 607f063
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,6 +35,9 @@ if (MSVC)
     include_directories(SYSTEM libs/pthreadwin32)
     add_compile_options(-bigobj)
     add_compile_definitions(NOMINMAX)
+    if (MSVC_VERSION GREATER_EQUAL 1914)
+        add_compile_options("/Zc:__cplusplus")
+    endif ()
 endif ()
 
 #### MinGW or Cygwin have issues with object files that are too large

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -8,7 +8,6 @@ if (${BUILD_GRID_SYNTH})
         find_package(PkgConfig REQUIRED)
         pkg_check_modules(gmp REQUIRED IMPORTED_TARGET gmp)
         pkg_check_modules(gmpxx REQUIRED IMPORTED_TARGET gmpxx)
-        add_compile_definitions(__GMPXX_USE_CXX11)
     else ()
         find_package(GMP REQUIRED)
     endif ()

diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
@@ -4,6 +4,9 @@ set(TARGET_NAME "unit_tests")
 #### Link Google Test dynamically if using MSVC
 if (MSVC)
     set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+    if (MSVC_VERSION GREATER_EQUAL 1914)
+        add_compile_options("/Zc:__cplusplus")
+    endif ()
 endif ()
 
 if (${BUILD_GRID_SYNTH})
@@ -12,7 +15,6 @@ if (${BUILD_GRID_SYNTH})
         find_package(PkgConfig REQUIRED)
         pkg_check_modules(gmp REQUIRED IMPORTED_TARGET gmp)
         pkg_check_modules(gmpxx REQUIRED IMPORTED_TARGET gmpxx)
-        add_compile_definitions(__GMPXX_USE_CXX11)
     else ()
         find_package(GMP REQUIRED)
     endif ()