[Cmake-commits] CMake branch, next, updated. v3.1.0-1445-g3406589

Stephen Kelly steveire at gmail.com
Wed Dec 31 10:34:27 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  3406589fe3acfffc5db95f82220f13e8e29eea0d (commit)
       via  e8b35676db2949443709d1d819f66f3df15d0c2e (commit)
      from  8ad33e01d2ed27c9ac136fd19516a21449b4c87b (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=3406589fe3acfffc5db95f82220f13e8e29eea0d
commit 3406589fe3acfffc5db95f82220f13e8e29eea0d
Merge: 8ad33e0 e8b3567
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Dec 31 10:34:26 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 31 10:34:26 2014 -0500

    Merge topic 'RunCMake-stderr-default' into next
    
    e8b35676 Update tests.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8b35676db2949443709d1d819f66f3df15d0c2e
commit e8b35676db2949443709d1d819f66f3df15d0c2e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Dec 31 16:33:21 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Dec 31 16:33:49 2014 +0100

    Update tests.

diff --git a/Tests/RunCMake/Languages/LINK_LANGUAGE-genex-stderr.txt b/Tests/RunCMake/Languages/LINK_LANGUAGE-genex-stderr.txt
index 3a7f480..03c002e 100644
--- a/Tests/RunCMake/Languages/LINK_LANGUAGE-genex-stderr.txt
+++ b/Tests/RunCMake/Languages/LINK_LANGUAGE-genex-stderr.txt
@@ -6,4 +6,4 @@ CMake Error at LINK_LANGUAGE-genex.cmake:[0-9]+ \(target_link_libraries\):
   LINKER_LANGUAGE target property can not be used while evaluating link
   libraries for a static library
 Call Stack \(most recent call first\):
-  CMakeLists.txt:3 \(include\)
+  CMakeLists.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/Languages/link-libraries-TARGET_FILE-genex-stderr.txt b/Tests/RunCMake/Languages/link-libraries-TARGET_FILE-genex-stderr.txt
index d8bc238..be3b12c 100644
--- a/Tests/RunCMake/Languages/link-libraries-TARGET_FILE-genex-stderr.txt
+++ b/Tests/RunCMake/Languages/link-libraries-TARGET_FILE-genex-stderr.txt
@@ -6,4 +6,4 @@ CMake Error at link-libraries-TARGET_FILE-genex.cmake:[0-9]+ \(target_link_libra
   Expressions which require the linker language may not be used while
   evaluating link libraries
 Call Stack \(most recent call first\):
-  CMakeLists.txt:3 \(include\)
+  CMakeLists.txt:[0-9]+ \(include\)

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

Summary of changes:
 Tests/RunCMake/Languages/LINK_LANGUAGE-genex-stderr.txt              |    2 +-
 Tests/RunCMake/Languages/link-libraries-TARGET_FILE-genex-stderr.txt |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list