[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-810-gc3647c0

[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  c3647c0c9b8b8627b3da7d85c6332f1a0e7138b0 (commit)
       via  2fb7ce0510c6cd8303d298f7cfc8425e51e46270 (commit)
      from  71fc22dba746242f93bc6fcebecf4e4c8c4660f8 (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=c3647c0c9b8b8627b3da7d85c6332f1a0e7138b0
commit c3647c0c9b8b8627b3da7d85c6332f1a0e7138b0
Merge: 71fc22d 2fb7ce0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 23 09:38:52 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Nov 23 09:38:52 2014 -0500

    Merge topic 'WCDH-multi-file' into next
    
    2fb7ce05 Fix tests.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2fb7ce0510c6cd8303d298f7cfc8425e51e46270
commit 2fb7ce0510c6cd8303d298f7cfc8425e51e46270
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 23 15:38:26 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Nov 23 15:38:26 2014 +0100

    Fix tests.

diff --git a/Tests/RunCMake/WriteCompilerDetectionHeader/MultiBadOutDir-stderr.txt b/Tests/RunCMake/WriteCompilerDetectionHeader/MultiBadOutDir-stderr.txt
index 754f2e3..6658d5d 100644
--- a/Tests/RunCMake/WriteCompilerDetectionHeader/MultiBadOutDir-stderr.txt
+++ b/Tests/RunCMake/WriteCompilerDetectionHeader/MultiBadOutDir-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at .*cmake/Modules/WriteCompilerDetectionHeader.cmake:[0-9]+ \(message\):
+CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:[0-9]+ \(message\):
   The compiler-specific output directory must be within the same directory as
   the main file.
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/WriteCompilerDetectionHeader/MultiNoOutFileVar-stderr.txt b/Tests/RunCMake/WriteCompilerDetectionHeader/MultiNoOutFileVar-stderr.txt
index 4872a97..50f9b6f 100644
--- a/Tests/RunCMake/WriteCompilerDetectionHeader/MultiNoOutFileVar-stderr.txt
+++ b/Tests/RunCMake/WriteCompilerDetectionHeader/MultiNoOutFileVar-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at .*cmake/Modules/WriteCompilerDetectionHeader.cmake:[0-9]+ \(message\):
+CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:[0-9]+ \(message\):
   If OUTPUT_DIR is specified, then OUTPUT_FILES_VAR must also be specified.
 Call Stack \(most recent call first\):
   MultiNoOutFileVar.cmake:4 \(write_compiler_detection_header\)
diff --git a/Tests/RunCMake/WriteCompilerDetectionHeader/MultiNoOutdir-stderr.txt b/Tests/RunCMake/WriteCompilerDetectionHeader/MultiNoOutdir-stderr.txt
index 024ac50..1c83a1a 100644
--- a/Tests/RunCMake/WriteCompilerDetectionHeader/MultiNoOutdir-stderr.txt
+++ b/Tests/RunCMake/WriteCompilerDetectionHeader/MultiNoOutdir-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at .*cmake/Modules/WriteCompilerDetectionHeader.cmake:[0-9]+ \(message\):
+CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:[0-9]+ \(message\):
   If OUTPUT_FILES_VAR is specified, then OUTPUT_DIR must also be specified.
 Call Stack \(most recent call first\):
   MultiNoOutdir.cmake:4 \(write_compiler_detection_header\)

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

Summary of changes:
 .../RunCMake/WriteCompilerDetectionHeader/MultiBadOutDir-stderr.txt  |    2 +-
 .../WriteCompilerDetectionHeader/MultiNoOutFileVar-stderr.txt        |    2 +-
 Tests/RunCMake/WriteCompilerDetectionHeader/MultiNoOutdir-stderr.txt |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake