[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1807-g37c294a

Brad King brad.king at kitware.com
Thu Feb 27 09:29:18 EST 2014


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  37c294a775cd2a7dc3a34553b271b1dc7738dd2d (commit)
       via  ba0a2254802c57e3b837d1bbf0911c0719731dd1 (commit)
      from  646c444359faccd06b897b5745b79f8e64e20666 (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=37c294a775cd2a7dc3a34553b271b1dc7738dd2d
commit 37c294a775cd2a7dc3a34553b271b1dc7738dd2d
Merge: 646c444 ba0a225
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 27 09:29:17 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 27 09:29:17 2014 -0500

    Merge topic 'dev/faster-evis' into next
    
    ba0a2254 tests: Fix RunCMake.Syntax UnterminatedBrace2 expected stderr


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba0a2254802c57e3b837d1bbf0911c0719731dd1
commit ba0a2254802c57e3b837d1bbf0911c0719731dd1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 27 09:29:08 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 27 09:29:08 2014 -0500

    tests: Fix RunCMake.Syntax UnterminatedBrace2 expected stderr

diff --git a/Tests/RunCMake/Syntax/UnterminatedBrace2-stderr.txt b/Tests/RunCMake/Syntax/UnterminatedBrace2-stderr.txt
index 582a25e..b332d34 100644
--- a/Tests/RunCMake/Syntax/UnterminatedBrace2-stderr.txt
+++ b/Tests/RunCMake/Syntax/UnterminatedBrace2-stderr.txt
@@ -1,7 +1,7 @@
 CMake Error at UnterminatedBrace2.cmake:4 \(set\):
   Syntax error in cmake code at
 
-    /home/boeckb/code/cmake/src/Tests/RunCMake/Syntax/UnterminatedBrace2.cmake:4
+    .*/Tests/RunCMake/Syntax/UnterminatedBrace2.cmake:4
 
   when parsing string
 

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list