This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 71371e3d936c89945e4369c0daebe9c7e13dec31 (commit)
via eca275f63d1ef03c366cf498db4f4ffd393a5245 (commit)
from 4eebc52eca3d551423d7e512284a3b71e13d30a0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=71371e3d936c89945e4369c0daebe9c7e13dec31
commit 71371e3d936c89945e4369c0daebe9c7e13dec31
Merge: 4eebc52 eca275f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Apr 30 13:59:44 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Apr 30 09:59:57 2019 -0400
Merge topic 'msvc-c-features'
eca275f63d CompileFeatures: Fix hard-coded MSVC C features
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3247
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eca275f63d1ef03c366cf498db4f4ffd393a5245
commit eca275f63d1ef03c366cf498db4f4ffd393a5245
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Apr 19 08:10:02 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Apr 22 08:22:54 2019 -0400
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.
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()
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/MSVC-C.cmake | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
