[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5000-g307f866

[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  307f8660618154d76704c6623e490484d0d935f5 (commit)
       via  bed3de60cd07ef16b41af42b6d2745c473dbd010 (commit)
      from  c3289839606a368d99db75eba899647be5615804 (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=307f8660618154d76704c6623e490484d0d935f5
commit 307f8660618154d76704c6623e490484d0d935f5
Merge: c328983 bed3de6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Nov 9 16:05:24 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 9 16:05:24 2013 -0500

    Merge topic 'target_compile_features' into next
    
    bed3de6 Fix test pass simulation.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bed3de60cd07ef16b41af42b6d2745c473dbd010
commit bed3de60cd07ef16b41af42b6d2745c473dbd010
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Nov 9 22:04:44 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Nov 9 22:04:44 2013 +0100

    Fix test pass simulation.

diff --git a/Tests/RunCMake/target_compile_features/no_matching_cxx_feature-stderr.txt b/Tests/RunCMake/target_compile_features/no_matching_cxx_feature-stderr.txt
index e92fe43..7b5d1b4 100644
--- a/Tests/RunCMake/target_compile_features/no_matching_cxx_feature-stderr.txt
+++ b/Tests/RunCMake/target_compile_features/no_matching_cxx_feature-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at no_matching_cxx_feature.cmake:24 \(target_compile_features\):
+CMake Error at no_matching_cxx_feature.cmake:[0-9][0-9]? \((target_compile_features|message)\):
   The compiler feature "[^"]+" is not known to compiler "[^"]*"[ \n]*version[ \n]*.+\.
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
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 0d3e0ed..e74a8d7 100644
--- a/Tests/RunCMake/target_compile_features/no_matching_cxx_feature.cmake
+++ b/Tests/RunCMake/target_compile_features/no_matching_cxx_feature.cmake
@@ -2,10 +2,9 @@
 if (NOT ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";gnuxx_typeof;"
     AND NOT ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";msvcxx_sealed;" )
   # Simulate passing the test.
-  message(SEND_ERROR "CMake Error at no_matching_cxx_feature.cmake:15 (target_compile_features):\
-  The compiler feature \"gnuxx_dummy\" is not known to compiler \"GNU\" version 4.8.1.\
-Call Stack (most recent call first):\
-  CMakeLists.txt:3 (include)\n")
+  message(SEND_ERROR
+    "The compiler feature \"gnuxx_dummy\" is not known to compiler \"GNU\" version 4.8.1."
+  )
   return()
 endif()
 

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

Summary of changes:
 .../no_matching_cxx_feature-stderr.txt             |    2 +-
 .../no_matching_cxx_feature.cmake                  |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake