diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-19 12:10:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-04-22 12:22:54 (GMT) |
| commit | eca275f63d1ef03c366cf498db4f4ffd393a5245 (patch) | |
| tree | 650811a0cc2bab6d4a4aa1e5f2b21b29bc86499b /Modules/Compiler/MSVC-C.cmake | |
| parent | 8e4899fd6cb3518723710f7ba57d28ef058518c0 (diff) | |
| download | CMake-eca275f63d1ef03c366cf498db4f4ffd393a5245.zip CMake-eca275f63d1ef03c366cf498db4f4ffd393a5245.tar.gz CMake-eca275f63d1ef03c366cf498db4f4ffd393a5245.tar.bz2 | |
CompileFeatures: Fix hard-coded MSVC C features
In commit 8e4899fd6c (CompileFeatures: Record which C features the MSVC
compiler supports, 2019-04-12) our `cmake_record_c_compile_features`
macro was accidentally left not setting the `_result` variable, which
had previously been set by `_record_compiler_features`. The variable is
expected by the call site in `cmake_determine_compile_features` and used
to switch between "failed" and "done" reports. Set it now.
Also record `c_variadic_macros` only for cl 14 (VS 2005) and higher
because it is not supported before that version.
Diffstat (limited to 'Modules/Compiler/MSVC-C.cmake')
| -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() |