diff options
author | Raul Tambre <raul@tambre.ee> | 2020-08-20 11:12:47 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2020-08-20 13:45:47 (GMT) |
commit | 95bc11dbb4997b0e014960a54626907ad8d8b064 (patch) | |
tree | be1d4ac4b7b996050f7c964e6bd823a290006e2a /Modules | |
parent | aaa5eab410c2e3fe41ebf7a2316be9c51572dbd2 (diff) | |
download | CMake-95bc11dbb4997b0e014960a54626907ad8d8b064.zip CMake-95bc11dbb4997b0e014960a54626907ad8d8b064.tar.gz CMake-95bc11dbb4997b0e014960a54626907ad8d8b064.tar.bz2 |
MSVC: Record support for c_static_assert
Supported since MSVC 19.28.29115 (VS 16.8.0 Preview 1.0).
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/Compiler/MSVC-C-FeatureTests.cmake | 4 | ||||
-rw-r--r-- | Modules/Compiler/MSVC-C.cmake | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Modules/Compiler/MSVC-C-FeatureTests.cmake b/Modules/Compiler/MSVC-C-FeatureTests.cmake index 862bff3..4024c12 100644 --- a/Modules/Compiler/MSVC-C-FeatureTests.cmake +++ b/Modules/Compiler/MSVC-C-FeatureTests.cmake @@ -1,9 +1,7 @@ set(_cmake_oldestSupported "_MSC_VER >= 1600") -# Not yet supported: -#set(_cmake_feature_test_c_static_assert "") - set(_cmake_feature_test_c_restrict "_MSC_VER >= 1927") +set(_cmake_feature_test_c_static_assert "_MSC_VER >= 1928") set(_cmake_feature_test_c_variadic_macros "${_cmake_oldestSupported}") set(_cmake_feature_test_c_function_prototypes "${_cmake_oldestSupported}") diff --git a/Modules/Compiler/MSVC-C.cmake b/Modules/Compiler/MSVC-C.cmake index a05e6a0..31ae7fd 100644 --- a/Modules/Compiler/MSVC-C.cmake +++ b/Modules/Compiler/MSVC-C.cmake @@ -51,6 +51,10 @@ macro(cmake_record_c_compile_features) list(APPEND CMAKE_C_COMPILE_FEATURES c_restrict) list(APPEND CMAKE_C99_COMPILE_FEATURES c_restrict) endif() + if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 19.28) + list(APPEND CMAKE_C_COMPILE_FEATURES c_static_assert) + list(APPEND CMAKE_C11_COMPILE_FEATURES c_static_assert) + endif() set(_result 0) # expected by cmake_determine_compile_features endmacro() |