[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2841-g6c7abd4

[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  6c7abd43ab4217c610ad91e9eb11c0d72c5be8b5 (commit)
       via  7d512744187187c6e918d54d8ea5cc828bb65861 (commit)
      from  0aac9b975ea4b33338030883531852f9c7d30769 (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=6c7abd43ab4217c610ad91e9eb11c0d72c5be8b5
commit 6c7abd43ab4217c610ad91e9eb11c0d72c5be8b5
Merge: 0aac9b9 7d51274
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 16:06:53 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 6 16:06:53 2014 -0400

    Merge topic 'compile-features-C-language' into next
    
    7d512744 Fix tests.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d512744187187c6e918d54d8ea5cc828bb65861
commit 7d512744187187c6e918d54d8ea5cc828bb65861
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 22:02:54 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue May 6 22:04:20 2014 +0200

    Fix tests.

diff --git a/Tests/RunCMake/CompileFeatures/NoSupportedCFeatures-stderr.txt b/Tests/RunCMake/CompileFeatures/NoSupportedCFeatures-stderr.txt
index 4838e39..22da1b8 100644
--- a/Tests/RunCMake/CompileFeatures/NoSupportedCFeatures-stderr.txt
+++ b/Tests/RunCMake/CompileFeatures/NoSupportedCFeatures-stderr.txt
@@ -3,6 +3,6 @@ CMake Error at NoSupportedCFeatures.cmake:3 \(target_compile_features\):
 
   "GNU"
 
-  version 4.8.1.
+  version *[.0-9]+\.
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/CompileFeatures/NoSupportedCFeaturesGenex-stderr.txt b/Tests/RunCMake/CompileFeatures/NoSupportedCFeaturesGenex-stderr.txt
index be000dc..99a9358 100644
--- a/Tests/RunCMake/CompileFeatures/NoSupportedCFeaturesGenex-stderr.txt
+++ b/Tests/RunCMake/CompileFeatures/NoSupportedCFeaturesGenex-stderr.txt
@@ -3,4 +3,4 @@ CMake Error in CMakeLists.txt:
 
   "GNU"
 
-  version 4.8.1.
+  version *[.0-9]+\.
diff --git a/Tests/RunCMake/Configure/FailCopyFileABI-stdout.txt b/Tests/RunCMake/Configure/FailCopyFileABI-stdout.txt
index 050dbdf..9e12e22 100644
--- a/Tests/RunCMake/Configure/FailCopyFileABI-stdout.txt
+++ b/Tests/RunCMake/Configure/FailCopyFileABI-stdout.txt
@@ -1,6 +1,6 @@
 -- Detecting C compiler ABI info
 -- Detecting C compiler ABI info - failed
 -- Detecting C compile features
--- Detecting C compile features - failed
+-- Detecting C compile features - .*
 -- Configuring done
 -- Generating done

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

Summary of changes:
 Tests/RunCMake/CompileFeatures/NoSupportedCFeatures-stderr.txt      |    2 +-
 Tests/RunCMake/CompileFeatures/NoSupportedCFeaturesGenex-stderr.txt |    2 +-
 Tests/RunCMake/Configure/FailCopyFileABI-stdout.txt                 |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake