[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2695-g1644a32
Stephen Kelly
steveire at gmail.com
Fri May 2 04:18:08 EDT 2014
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, next has been updated
via 1644a32ad00ce87d6bfe1e6d376cf1d935fcd370 (commit)
via e7c0ef119f72eaf411ed68bff4d698c115078bc2 (commit)
from 8c60ae4f773be8b4cf2530ad0212d9d1942f9695 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1644a32ad00ce87d6bfe1e6d376cf1d935fcd370
commit 1644a32ad00ce87d6bfe1e6d376cf1d935fcd370
Merge: 8c60ae4 e7c0ef1
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri May 2 04:18:07 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 2 04:18:07 2014 -0400
Merge topic 'CMAKE_CXX_KNOWN_FEATURES-global-property' into next
e7c0ef11 Fix feature tests.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7c0ef119f72eaf411ed68bff4d698c115078bc2
commit e7c0ef119f72eaf411ed68bff4d698c115078bc2
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri May 2 10:16:45 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri May 2 10:16:45 2014 +0200
Fix feature tests.
diff --git a/Modules/Internal/FeatureTesting.cmake b/Modules/Internal/FeatureTesting.cmake
index 92d262c..0fff36b 100644
--- a/Modules/Internal/FeatureTesting.cmake
+++ b/Modules/Internal/FeatureTesting.cmake
@@ -6,7 +6,10 @@ macro(record_compiler_features lang compile_flags feature_list)
file(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.bin")
file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.${lang_lc}" "
extern const char features[] = {\"\"\n")
- foreach(feature ${CMAKE_${lang}_KNOWN_FEATURES})
+
+ get_property(known_features GLOBAL PROPERTY CMAKE_${lang}_KNOWN_FEATURES)
+
+ foreach(feature ${known_features})
if (_cmake_feature_test_${feature})
if (${_cmake_feature_test_${feature}} STREQUAL 1)
set(_feature_condition "\"1\" ")
-----------------------------------------------------------------------
Summary of changes:
Modules/Internal/FeatureTesting.cmake | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list