[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2789-gf431c17

[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  f431c1752db821501084c35a87e1f2c633a13049 (commit)
       via  2d19e956fd2c2eec47cd8b7fa9a2e3e18a65a30d (commit)
      from  ef63068176eded03ef481adeab0c23b3cdedee67 (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=f431c1752db821501084c35a87e1f2c633a13049
commit f431c1752db821501084c35a87e1f2c633a13049
Merge: ef63068 2d19e95
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 13:22:49 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 6 13:22:49 2014 -0400

    Merge topic 'clang-features' into next
    
    2d19e956 Fix tests.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d19e956fd2c2eec47cd8b7fa9a2e3e18a65a30d
commit 2d19e956fd2c2eec47cd8b7fa9a2e3e18a65a30d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 19:22:28 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue May 6 19:22:28 2014 +0200

    Fix tests.

diff --git a/Tests/RunCMake/WriteCompilerDetectionHeader/InvalidCXXFeature-stderr.txt b/Tests/RunCMake/WriteCompilerDetectionHeader/InvalidCXXFeature-stderr.txt
index d21d73f..f34c9e1 100644
--- a/Tests/RunCMake/WriteCompilerDetectionHeader/InvalidCXXFeature-stderr.txt
+++ b/Tests/RunCMake/WriteCompilerDetectionHeader/InvalidCXXFeature-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:239 \(message\):
+CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:[0-9]+ \(message\):
   Unsupported feature cxx_not_a_feature.
 Call Stack \(most recent call first\):
   InvalidCXXFeature.cmake:4 \(write_compiler_detection_header\)
diff --git a/Tests/RunCMake/WriteCompilerDetectionHeader/InvalidCompiler-stderr.txt b/Tests/RunCMake/WriteCompilerDetectionHeader/InvalidCompiler-stderr.txt
index c757c35..f35f9f9 100644
--- a/Tests/RunCMake/WriteCompilerDetectionHeader/InvalidCompiler-stderr.txt
+++ b/Tests/RunCMake/WriteCompilerDetectionHeader/InvalidCompiler-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:198 \(message\):
+CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:[0-9]+ \(message\):
   Unsupported compiler NOT_A_COMPILER.
 Call Stack \(most recent call first\):
   InvalidCompiler.cmake:4 \(write_compiler_detection_header\)
diff --git a/Tests/RunCMake/WriteCompilerDetectionHeader/InvalidFeature-stderr.txt b/Tests/RunCMake/WriteCompilerDetectionHeader/InvalidFeature-stderr.txt
index 1f6ca45..0445744 100644
--- a/Tests/RunCMake/WriteCompilerDetectionHeader/InvalidFeature-stderr.txt
+++ b/Tests/RunCMake/WriteCompilerDetectionHeader/InvalidFeature-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:217 \(message\):
+CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:[0-9]+ \(message\):
   Unsupported feature not_a_feature.
 Call Stack \(most recent call first\):
   InvalidFeature.cmake:4 \(write_compiler_detection_header\)

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

Summary of changes:
 .../WriteCompilerDetectionHeader/InvalidCXXFeature-stderr.txt        |    2 +-
 .../RunCMake/WriteCompilerDetectionHeader/InvalidCompiler-stderr.txt |    2 +-
 .../RunCMake/WriteCompilerDetectionHeader/InvalidFeature-stderr.txt  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake