diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/DevModeWarnings.cmake | 2 | ||||
| -rw-r--r-- | cmake/StandardSettings.cmake | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/cmake/DevModeWarnings.cmake b/cmake/DevModeWarnings.cmake index 1ada85f5..1db8135f 100644 --- a/cmake/DevModeWarnings.cmake +++ b/cmake/DevModeWarnings.cmake @@ -74,6 +74,8 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # Disable C++20 compatibility for now. add_compile_flag_if_supported(CCACHE_COMPILER_WARNINGS "-Wno-c++2a-compat") + add_compile_flag_if_supported(CCACHE_COMPILER_WARNINGS "-Wno-c99-extensions") + add_compile_flag_if_supported(CCACHE_COMPILER_WARNINGS "-Wno-language-extension-token") # If compiler supports these warnings they have to be disabled for now. add_compile_flag_if_supported( diff --git a/cmake/StandardSettings.cmake b/cmake/StandardSettings.cmake index 9e09ea67..bee457c1 100644 --- a/cmake/StandardSettings.cmake +++ b/cmake/StandardSettings.cmake @@ -12,7 +12,7 @@ else() ) endif() -if(CMAKE_CXX_COMPILER_ID MATCHES "^GNU|(Apple)?Clang$") +if(CMAKE_CXX_COMPILER_ID MATCHES "^GNU|(Apple)?Clang$" AND NOT MSVC) option(ENABLE_COVERAGE "Enable coverage reporting for GCC/Clang" FALSE) if(ENABLE_COVERAGE) target_compile_options(standard_settings INTERFACE --coverage -O0 -g) @@ -55,17 +55,16 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "^GNU|(Apple)?Clang$") include(StdAtomic) include(StdFilesystem) - -elseif(MSVC) +elseif(MSVC AND NOT CMAKE_CXX_COMPILER_ID MATCHES "^Clang$") target_compile_options( standard_settings - INTERFACE /Zc:preprocessor /Zc:__cplusplus /D_CRT_SECURE_NO_WARNINGS + INTERFACE /Zc:preprocessor /Zc:__cplusplus ) endif() if(WIN32) target_compile_definitions( standard_settings - INTERFACE WIN32_LEAN_AND_MEAN + INTERFACE WIN32_LEAN_AND_MEAN _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS ) endif() |