[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2710-g075cd3b
Stephen Kelly
steveire at gmail.com
Fri May 2 06:25:17 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 075cd3be70a36f41b4df677ba0cc4dd12f6f419c (commit)
via 7c6a08eeea5e7542f5c390d8cdd7742e43d6ee61 (commit)
from d62ad4dc943edc8aa84aa9d5ba0d62b4a3b1fd2b (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=075cd3be70a36f41b4df677ba0cc4dd12f6f419c
commit 075cd3be70a36f41b4df677ba0cc4dd12f6f419c
Merge: d62ad4d 7c6a08e
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri May 2 06:25:16 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 2 06:25:16 2014 -0400
Merge topic 'WriteCompilerDetectionHeader-module' into next
7c6a08ee Fix test.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c6a08eeea5e7542f5c390d8cdd7742e43d6ee61
commit 7c6a08eeea5e7542f5c390d8cdd7742e43d6ee61
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri May 2 12:24:56 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri May 2 12:24:56 2014 +0200
Fix test.
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index 4cc3155..2f815fb 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -13,6 +13,8 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
include(WriteCompilerDetectionHeader)
+get_property(known_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
+
write_compiler_detection_header(
FILE "${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h"
PREFIX TEST
@@ -21,7 +23,7 @@ write_compiler_detection_header(
PROLOG "// something"
EPILOG "// more"
FEATURES
- ${CMAKE_CXX_KNOWN_FEATURES}
+ ${known_features}
)
macro(set_defines target true_defs false_defs)
-----------------------------------------------------------------------
Summary of changes:
Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list