[Cmake-commits] CMake branch, next, updated. v3.7.2-2346-ge2dadb0

[Brad King]

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  e2dadb0802b1e329d6b1df771ce6bfbe84b08a4b (commit)
       via  ef47272b075a2ad8018481d3fdfb6f2beb514056 (commit)
      from  c6db87387ee1e5c30b9bc873ad2438db5bd6e43a (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2dadb0802b1e329d6b1df771ce6bfbe84b08a4b
commit e2dadb0802b1e329d6b1df771ce6bfbe84b08a4b
Merge: c6db873 ef47272
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 25 15:05:35 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 25 15:05:35 2017 -0500

    Merge topic 'tests_auto_type' into next
    
    ef47272b Tests: use cxx_auto_type only if actually available


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ef47272b075a2ad8018481d3fdfb6f2beb514056
commit ef47272b075a2ad8018481d3fdfb6f2beb514056
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 25 21:00:30 2017 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Jan 25 21:00:30 2017 +0100

    Tests: use cxx_auto_type only if actually available
    
    The presence of CMAKE_CXX_COMPILE_FEATURES doesn't mean cxx_auto_type is always
    available.

diff --git a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
index 9b35f27..555a08f 100644
--- a/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_compile_features/CMakeLists.txt
@@ -26,7 +26,7 @@ if (CMAKE_C_COMPILE_FEATURES)
   target_link_libraries(restrict_user lib_restrict)
 endif()
 
-if (CMAKE_CXX_COMPILE_FEATURES)
+if (CMAKE_CXX_COMPILE_FEATURES AND ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_auto_type;")
   if (CMAKE_C_COMPILE_FEATURES)
     set(target_suffix _cxx)
   endif()
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index 0405def..13aa86e 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -275,7 +275,10 @@ if (CMAKE_CXX_COMPILE_FEATURES)
       )
     endif()
   endif()
+endif ()
 
+# these tests only work if at least cxx_auto_type is available
+if (";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_auto_type;")
   add_executable(CompileFeatures main.cpp)
   set_property(TARGET CompileFeatures
     PROPERTY COMPILE_FEATURES "cxx_auto_type"

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

Summary of changes:
 Tests/CMakeCommands/target_compile_features/CMakeLists.txt |    2 +-
 Tests/CompileFeatures/CMakeLists.txt                       |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake