[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3108-g8e1c6d3

[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  8e1c6d3498072dfcb540e79e3493a51baf655348 (commit)
       via  eb638c75cc43be338391f9a12f23570e7dfcd48d (commit)
      from  0654709d1a2a317325ef2e6f5789df8c6786670a (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=8e1c6d3498072dfcb540e79e3493a51baf655348
commit 8e1c6d3498072dfcb540e79e3493a51baf655348
Merge: 0654709 eb638c7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 10 07:09:30 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat May 10 07:09:30 2014 -0400

    Merge topic 'minor-cleanups' into next
    
    eb638c75 Tests: Make CompileFeatures feature list lang-specific.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb638c75cc43be338391f9a12f23570e7dfcd48d
commit eb638c75cc43be338391f9a12f23570e7dfcd48d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 10 13:05:46 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat May 10 13:05:46 2014 +0200

    Tests: Make CompileFeatures feature list lang-specific.

diff --git a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
index f083751..bb4e0f9 100644
--- a/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake
@@ -10,11 +10,11 @@ run_cmake(NotAFeature_OriginDebug_target_compile_features)
 
 run_cmake(generate_feature_list)
 file(READ
-  "${RunCMake_BINARY_DIR}/generate_feature_list-build/features.txt"
-  FEATURES
+  "${RunCMake_BINARY_DIR}/generate_feature_list-build/cxx_features.txt"
+  CXX_FEATURES
 )
 
-if (NOT FEATURES)
+if (NOT CXX_FEATURES)
   run_cmake(NoSupportedCxxFeatures)
   run_cmake(NoSupportedCxxFeaturesGenex)
 endif()
diff --git a/Tests/RunCMake/CompileFeatures/generate_feature_list.cmake b/Tests/RunCMake/CompileFeatures/generate_feature_list.cmake
index 06c4f73..beb15fc 100644
--- a/Tests/RunCMake/CompileFeatures/generate_feature_list.cmake
+++ b/Tests/RunCMake/CompileFeatures/generate_feature_list.cmake
@@ -1,5 +1,5 @@
 
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/features.txt"
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cxx_features.txt"
   "${CMAKE_CXX_COMPILE_FEATURES}"
 )
 

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

Summary of changes:
 Tests/RunCMake/CompileFeatures/RunCMakeTest.cmake          |    6 +++---
 Tests/RunCMake/CompileFeatures/generate_feature_list.cmake |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake