diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-25 14:26:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-08-25 14:26:54 (GMT) |
| commit | 4294526504368acaad3b948b3d59ade9dad23736 (patch) | |
| tree | 3c389b578bfa9401ada5a45e2b830e8da0f84a51 /Modules/Compiler | |
| parent | d9aa99dd54f3e646306ad63ca93fb74a27f84f50 (diff) | |
| parent | 95bc11dbb4997b0e014960a54626907ad8d8b064 (diff) | |
| download | CMake-4294526504368acaad3b948b3d59ade9dad23736.zip CMake-4294526504368acaad3b948b3d59ade9dad23736.tar.gz CMake-4294526504368acaad3b948b3d59ade9dad23736.tar.bz2 | |
Merge topic 'msvc_static_assert'
95bc11dbb4 MSVC: Record support for c_static_assert
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5148
Diffstat (limited to 'Modules/Compiler')
| -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() |