[Cmake-commits] CMake branch, next, updated. v3.2.2-2204-g1a66455

Brad King brad.king at kitware.com
Mon Apr 27 10:47:06 EDT 2015


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  1a66455db39eb57c3d53d1293f8fe80df06e4faf (commit)
       via  75bd5ca06ac35be95dfb5bb9442dd9391fc43a5c (commit)
      from  e6cacaa6b8e312415660d7c5c53f3740a5ab8861 (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=1a66455db39eb57c3d53d1293f8fe80df06e4faf
commit 1a66455db39eb57c3d53d1293f8fe80df06e4faf
Merge: e6cacaa 75bd5ca
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 27 10:47:06 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 27 10:47:06 2015 -0400

    Merge topic 'fix-test-RunCMake.CTest-line-numbers' into next
    
    75bd5ca0 Tests: Fix RunCMake.CTest to tolerate source line number changes


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75bd5ca06ac35be95dfb5bb9442dd9391fc43a5c
commit 75bd5ca06ac35be95dfb5bb9442dd9391fc43a5c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 27 10:46:32 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 27 10:46:52 2015 -0400

    Tests: Fix RunCMake.CTest to tolerate source line number changes

diff --git a/Tests/RunCMake/CTest/BeforeProject-stderr.txt b/Tests/RunCMake/CTest/BeforeProject-stderr.txt
index 2d934a4..d61856c 100644
--- a/Tests/RunCMake/CTest/BeforeProject-stderr.txt
+++ b/Tests/RunCMake/CTest/BeforeProject-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error at .*/Modules/CTestTargets.cmake:20 \(message\):
   Do not include\(CTest\) before calling project\(\).
 Call Stack \(most recent call first\):
-  .*/Modules/CTest.cmake:297 \(include\)
+  .*/Modules/CTest.cmake:[0-9]+ \(include\)
   BeforeProject.cmake:1 \(include\)
   CMakeLists.txt:5 \(include\)

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

Summary of changes:
 Tests/RunCMake/CTest/BeforeProject-stderr.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list