[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3054-g8650aca

[Stephen Kelly]

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  8650acab7c5194a1b3b4ad3be1624ea290e51b23 (commit)
       via  0ac001e82a9677d59023186fe246f56c6c9d5848 (commit)
      from  d9538f40fe4341994c4a7a13da7cb8be0afcb405 (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=8650acab7c5194a1b3b4ad3be1624ea290e51b23
commit 8650acab7c5194a1b3b4ad3be1624ea290e51b23
Merge: d9538f4 0ac001e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 8 12:37:55 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 8 12:37:55 2014 -0400

    Merge topic 'WriteCompilerDetectionHeader-module' into next
    
    0ac001e8 Namespace with language.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ac001e82a9677d59023186fe246f56c6c9d5848
commit 0ac001e82a9677d59023186fe246f56c6c9d5848
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 8 18:37:02 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu May 8 18:37:02 2014 +0200

    Namespace with language.

diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index 86b55a4..96bec25 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -5,7 +5,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 include(WriteCompilerDetectionHeader)
 
-get_property(known_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
+get_property(cxx_known_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
 
 write_compiler_detection_header(
   FILE "${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h"
@@ -15,7 +15,7 @@ write_compiler_detection_header(
   PROLOG "// something"
   EPILOG "// more"
   FEATURES
-    ${known_features}
+    ${cxx_known_features}
 )
 
 if (NOT CMAKE_CXX_COMPILER_ID STREQUAL GNU

-----------------------------------------------------------------------

Summary of changes:
 Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake