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 ab463b4341377f38d9b9dee39386535b6f0b7d9a (commit)
via 0f309aa9f246fbc9ba6b9625daba8b8b3100c5b6 (commit)
from 965e8cc2d8f9434cfde914c5c4e2ebf5fa01dfd6 (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=ab463b4341377f38d9b9dee39386535b6f0b7d9a
commit ab463b4341377f38d9b9dee39386535b6f0b7d9a
Merge: 965e8cc 0f309aa
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Fri Feb 28 11:50:01 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Feb 28 11:50:01 2014 -0500
Merge topic 'alt-test-generator' into next
0f309aa9 Fix up the CompilerChange test.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f309aa9f246fbc9ba6b9625daba8b8b3100c5b6
commit 0f309aa9f246fbc9ba6b9625daba8b8b3100c5b6
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Fri Feb 28 17:48:38 2014 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Fri Feb 28 17:48:38 2014 +0100
Fix up the CompilerChange test.
diff --git a/Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt
b/Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt
index 17621b7..bc668e8 100644
--- a/Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt
+++ b/Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt
@@ -1 +1 @@
--- CMAKE_C_COMPILER is ".*/Tests/RunCMake/CompilerChange/cc1.sh"
+-- CMAKE_C_COMPILER is ".*Tests/RunCMake/CompilerChange/cc1.sh"
diff --git a/Tests/RunCMake/CompilerChange/SecondCompiler-stderr.txt
b/Tests/RunCMake/CompilerChange/SecondCompiler-stderr.txt
index 3a01c53..692fe2c 100644
--- a/Tests/RunCMake/CompilerChange/SecondCompiler-stderr.txt
+++ b/Tests/RunCMake/CompilerChange/SecondCompiler-stderr.txt
@@ -1,4 +1,4 @@
You have changed variables that require your cache to be deleted.
Configure will be re-run and you may have to reset some variables.
The following variables have changed:
-CMAKE_C_COMPILER=.*/Tests/RunCMake/CompilerChange/cc2.sh
+CMAKE_C_COMPILER=.*Tests/RunCMake/CompilerChange/cc2.sh
diff --git a/Tests/RunCMake/CompilerChange/SecondCompiler-stdout.txt
b/Tests/RunCMake/CompilerChange/SecondCompiler-stdout.txt
index 26ca964..2da017c 100644
--- a/Tests/RunCMake/CompilerChange/SecondCompiler-stdout.txt
+++ b/Tests/RunCMake/CompilerChange/SecondCompiler-stdout.txt
@@ -1 +1 @@
--- CMAKE_C_COMPILER is ".*/Tests/RunCMake/CompilerChange/cc2.sh"
+-- CMAKE_C_COMPILER is ".*Tests/RunCMake/CompilerChange/cc2.sh"
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt | 2 +-
Tests/RunCMake/CompilerChange/SecondCompiler-stderr.txt | 2 +-
Tests/RunCMake/CompilerChange/SecondCompiler-stdout.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
