[Cmake-commits] CMake branch, next, updated. v2.8.12.1-4962-ge5d4503

[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  e5d450370277b6da9763b8bf1163227e5231d11d (commit)
       via  74742c504e92febbd36923686ddf36fc08477262 (commit)
      from  086c1ed732ae728813014ffd5629f62ea78ad2a6 (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=e5d450370277b6da9763b8bf1163227e5231d11d
commit e5d450370277b6da9763b8bf1163227e5231d11d
Merge: 086c1ed 74742c5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Nov 9 08:41:10 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 9 08:41:10 2013 -0500

    Merge topic 'target_compile_features' into next
    
    74742c5 Update unit test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74742c504e92febbd36923686ddf36fc08477262
commit 74742c504e92febbd36923686ddf36fc08477262
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Nov 9 14:37:25 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Nov 9 14:40:23 2013 +0100

    Update unit test.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 8404e68..0ebcf1b 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -128,5 +128,7 @@ endif()
 add_RunCMake_test(File_Generate)
 add_RunCMake_test(ExportWithoutLanguage)
 add_RunCMake_test(target_link_libraries)
+string(REPLACE ";" "-" features "${CMAKE_CXX_COMPILE_FEATURES}")
+set(target_compile_features_ARGS -DCMAKE_CXX_COMPILE_FEATURES=${features})
 add_RunCMake_test(target_compile_features)
 add_RunCMake_test(CheckModules)
diff --git a/Tests/RunCMake/target_compile_features/RunCMakeTest.cmake b/Tests/RunCMake/target_compile_features/RunCMakeTest.cmake
index f2abef7..73ab3a2 100644
--- a/Tests/RunCMake/target_compile_features/RunCMakeTest.cmake
+++ b/Tests/RunCMake/target_compile_features/RunCMakeTest.cmake
@@ -8,4 +8,9 @@ run_cmake(invalid_args_on_interface)
 run_cmake(imported_target)
 run_cmake(no_target)
 run_cmake(not_a_cxx_feature)
-run_cmake(no_matching_cxx_feature)
+
+string(REPLACE "-" ";" CMAKE_CXX_COMPILE_FEATURES "${CMAKE_CXX_COMPILE_FEATURES}")
+if (";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";gnuxx_typeof;"
+    OR ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";msvcxx_sealed;" )
+  run_cmake(no_matching_cxx_feature)
+endif()
diff --git a/Tests/RunCMake/target_compile_features/no_matching_cxx_feature.cmake b/Tests/RunCMake/target_compile_features/no_matching_cxx_feature.cmake
index 8408d43..5d5133e 100644
--- a/Tests/RunCMake/target_compile_features/no_matching_cxx_feature.cmake
+++ b/Tests/RunCMake/target_compile_features/no_matching_cxx_feature.cmake
@@ -10,8 +10,6 @@ else()
   set(feature gnuxx_typeof)
 endif()
 
-message("CMAKE_CXX_COMPILE_FEATURES ${CMAKE_CXX_COMPILE_FEATURES}")
-
 add_executable(main empty.cpp)
 
 target_compile_features(main
diff --git a/Tests/SystemInformation/SystemInformation.in b/Tests/SystemInformation/SystemInformation.in
index df3bf49..69af703 100644
--- a/Tests/SystemInformation/SystemInformation.in
+++ b/Tests/SystemInformation/SystemInformation.in
@@ -21,6 +21,7 @@ CMAKE_C_COMPILER_ID == "${CMAKE_C_COMPILER_ID}"
 CMAKE_C_COMPILER_VERSION == "${CMAKE_C_COMPILER_VERSION}"
 CMAKE_CXX_COMPILER_ID == "${CMAKE_CXX_COMPILER_ID}"
 CMAKE_CXX_COMPILER_VERSION == "${CMAKE_CXX_COMPILER_VERSION}"
+CMAKE_CXX_COMPILE_FEATURES == "${CMAKE_CXX_COMPILE_FEATURES}"
 
 // C shared library flag
 CMAKE_SHARED_LIBRARY_C_FLAGS == "${CMAKE_SHARED_LIBRARY_C_FLAGS}"

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt                      |    2 ++
 .../target_compile_features/RunCMakeTest.cmake     |    7 ++++++-
 .../no_matching_cxx_feature.cmake                  |    2 --
 Tests/SystemInformation/SystemInformation.in       |    1 +
 4 files changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake