Add __cplusplus macro for MSVC

anand-bala · Jan 13, 2021 · 2af65d4 · 2af65d4
1 parent b7bbd68
commit 2af65d4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -69,10 +69,7 @@ set(LCOV_REMOVE_PATTERNS
     "${CMAKE_CURRENT_LISTS_DIR}/examples/*"
 )
 
-set(CMAKE_CXX_STANDARD
-    17
-    CACHE STRING "C++ version selection"
-)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS ON)
 

diff --git a/cmake/StandardProjectSettings.cmake b/cmake/StandardProjectSettings.cmake
@@ -19,7 +19,7 @@ endif()
 option(ENABLE_LTO "Enable link time optimization?" OFF)
 
 include(CheckIPOSupported)
-check_ipo_supported(RESULT result OUTPUT output)
+check_ipo_supported(RESULT RESULT OUTPUT OUTPUT)
 if(result)
   set(ENABLE_LTO
       ON
@@ -40,6 +40,10 @@ function(set_default_compile_options target)
     endif()
   endif()
 
+  if(MSVC)
+    target_compile_options(${target} PRIVATE /Zc:__cplusplus)
+  endif()
+
 endfunction()
 
 function(set_std_filesystem_options target)