[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5528-gf8ef84c

[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  f8ef84cc33e751f75326d789694734dd4d79b42d (commit)
       via  fab732b09b769e3fe5c8ecc05d605d2fde4dd0db (commit)
       via  1cb01ac80c9b60a111e0ac6090e8398382ef672f (commit)
      from  5571e74c4e0756ca8b6639d3c1f88da881e45e1d (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=f8ef84cc33e751f75326d789694734dd4d79b42d
commit f8ef84cc33e751f75326d789694734dd4d79b42d
Merge: 5571e74 fab732b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 20 18:18:37 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 20 18:18:37 2013 -0500

    Merge topic 'target_compile_features' into next
    
    fab732b Don't run the CxxDialect test if CMP0025 is not set on APPLE.
    1cb01ac Make the error output more-easy for the regex engine to handle.

diff --cc Tests/CMakeLists.txt
index ab17902,223da03..6220ca7
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@@ -269,12 -269,18 +269,19 @@@ if(BUILD_TESTING
    ADD_TEST_MACRO(CompileOptions CompileOptions)
    ADD_TEST_MACRO(CompatibleInterface CompatibleInterface)
    ADD_TEST_MACRO(AliasTarget AliasTarget)
 +  ADD_TEST_MACRO(StagingPrefix StagingPrefix)
    ADD_TEST_MACRO(InterfaceLibrary InterfaceLibrary)
-   if((CMAKE_CXX_COMPILER_ID STREQUAL GNU
-         AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
-       OR (CMAKE_CXX_COMPILER_ID STREQUAL Clang
+   if(CMAKE_CXX_COMPILER_ID STREQUAL GNU
+       AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
+     set(runCxxDialectTest 1)
+   endif()
+   if(CMAKE_CXX_COMPILER_ID STREQUAL Clang
          AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2.9))
+     if(NOT APPLE OR POLICY CMP0025)
+       set(runCxxDialectTest 1)
+     endif()
+   endif()
+   if(runCxxDialectTest)
      ADD_TEST_MACRO(CxxDialect CxxDialect)
    endif()
    set_tests_properties(EmptyLibrary PROPERTIES

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fab732b09b769e3fe5c8ecc05d605d2fde4dd0db
commit fab732b09b769e3fe5c8ecc05d605d2fde4dd0db
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 20 16:37:16 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Nov 20 16:37:16 2013 +0100

    Don't run the CxxDialect test if CMP0025 is not set on APPLE.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 3ac7c8a..223da03 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -270,10 +270,17 @@ if(BUILD_TESTING)
   ADD_TEST_MACRO(CompatibleInterface CompatibleInterface)
   ADD_TEST_MACRO(AliasTarget AliasTarget)
   ADD_TEST_MACRO(InterfaceLibrary InterfaceLibrary)
-  if((CMAKE_CXX_COMPILER_ID STREQUAL GNU
-        AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
-      OR (CMAKE_CXX_COMPILER_ID STREQUAL Clang
+  if(CMAKE_CXX_COMPILER_ID STREQUAL GNU
+      AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
+    set(runCxxDialectTest 1)
+  endif()
+  if(CMAKE_CXX_COMPILER_ID STREQUAL Clang
         AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2.9))
+    if(NOT APPLE OR POLICY CMP0025)
+      set(runCxxDialectTest 1)
+    endif()
+  endif()
+  if(runCxxDialectTest)
     ADD_TEST_MACRO(CxxDialect CxxDialect)
   endif()
   set_tests_properties(EmptyLibrary PROPERTIES

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1cb01ac80c9b60a111e0ac6090e8398382ef672f
commit 1cb01ac80c9b60a111e0ac6090e8398382ef672f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 20 16:32:58 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Nov 20 16:32:58 2013 +0100

    Make the error output more-easy for the regex engine to handle.
    
    Apparently it can not handle lines ending in ".

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0de7b66..17ce8ee 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4484,8 +4484,8 @@ AddRequiredTargetFeature(cmTarget *target, const char *feature) const
     {
     cmOStringStream e;
     e << "The compiler feature \"" << feature
-      << "\" is not known to compiler \""
-      << this->GetDefinition("CMAKE_CXX_COMPILER_ID") << "\" version "
+      << "\" is not known to compiler\n\""
+      << this->GetDefinition("CMAKE_CXX_COMPILER_ID") << "\"\nversion "
       << this->GetDefinition("CMAKE_CXX_COMPILER_VERSION") << ".";
     this->IssueMessage(cmake::FATAL_ERROR, e.str().c_str());
     return false;
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 4df6ee4..a8f60c7 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,8 @@
 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]*.+\.
+  The compiler feature "[^"]+" is not known to compiler
+
+  "[^"]*"
+
+  version *[.0-9]+\.
 Call Stack \(most recent call first\):
   CMakeLists.txt:4 \(include\)

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

Summary of changes:
 Source/cmMakefile.cxx                              |    4 ++--
 Tests/CMakeLists.txt                               |   13 ++++++++++---
 .../no_matching_cxx_feature-stderr.txt             |    6 +++++-
 3 files changed, 17 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake