diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-30 13:59:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-04-30 13:59:57 (GMT) |
| commit | 71371e3d936c89945e4369c0daebe9c7e13dec31 (patch) | |
| tree | c4f29b54ec4765e304b73e0ce09acfbc938de19e /Modules/Compiler | |
| parent | 4eebc52eca3d551423d7e512284a3b71e13d30a0 (diff) | |
| parent | eca275f63d1ef03c366cf498db4f4ffd393a5245 (diff) | |
| download | CMake-71371e3d936c89945e4369c0daebe9c7e13dec31.zip CMake-71371e3d936c89945e4369c0daebe9c7e13dec31.tar.gz CMake-71371e3d936c89945e4369c0daebe9c7e13dec31.tar.bz2 | |
Merge topic 'msvc-c-features'
eca275f63d CompileFeatures: Fix hard-coded MSVC C features
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3247
Diffstat (limited to 'Modules/Compiler')
| -rw-r--r-- | Modules/Compiler/MSVC-C.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Modules/Compiler/MSVC-C.cmake b/Modules/Compiler/MSVC-C.cmake index a722130..f56227b 100644 --- a/Modules/Compiler/MSVC-C.cmake +++ b/Modules/Compiler/MSVC-C.cmake @@ -21,9 +21,13 @@ macro(cmake_record_c_compile_features) c_std_99 c_std_11 c_function_prototypes - c_variadic_macros ) list(APPEND CMAKE_C90_COMPILE_FEATURES c_std_90 c_function_prototypes) - list(APPEND CMAKE_C99_COMPILE_FEATURES c_std_99 c_variadic_macros) + list(APPEND CMAKE_C99_COMPILE_FEATURES c_std_99) list(APPEND CMAKE_C11_COMPILE_FEATURES c_std_11) + if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 14.0) + list(APPEND CMAKE_C_COMPILE_FEATURES c_variadic_macros) + list(APPEND CMAKE_C99_COMPILE_FEATURES c_variadic_macros) + endif() + set(_result 0) # expected by cmake_determine_compile_features endmacro() |