Add /Zc:__cplusplus

Trying to build tests will fail if it's only added to wpiutil's list
wpilibsuite · Jul 12, 2024 · 16a9499 · 16a9499
1 parent f60e465
commit 16a9499
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,6 +31,9 @@ include(OptionValidation)
 
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
 set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
+if(MSVC)
+    add_compile_options(/Zc:__cplusplus)
+endif()
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${WPILIB_BINARY_DIR}/lib)

diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt
@@ -151,7 +151,7 @@ target_compile_features(wpiutil PUBLIC cxx_std_20)
 if(MSVC)
     target_compile_options(
         wpiutil
-        PUBLIC /permissive- /Zc:preprocessor /Zc:throwingNew /MP /bigobj /utf-8
+        PUBLIC /permissive- /Zc:preprocessor /Zc:__cplusplus /Zc:throwingNew /MP /bigobj /utf-8
     )
     target_compile_definitions(wpiutil PRIVATE -D_CRT_SECURE_NO_WARNINGS)
 endif()