[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1694-g3001e34

Stephen Kelly steveire at gmail.com
Tue Apr 1 07:40:33 EDT 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  3001e34fdebb5a54f7725b98090f3cf8da8a63ef (commit)
       via  4419952488d2fbcda86b5a25e0cdbd0b7504e30d (commit)
      from  f8db47f252e89715667744546918a2440f26c6d9 (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=3001e34fdebb5a54f7725b98090f3cf8da8a63ef
commit 3001e34fdebb5a54f7725b98090f3cf8da8a63ef
Merge: f8db47f 4419952
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Apr 1 07:40:32 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 1 07:40:32 2014 -0400

    Merge topic 'target-transitive-sources' into next
    
    44199524 Fix up test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4419952488d2fbcda86b5a25e0cdbd0b7504e30d
commit 4419952488d2fbcda86b5a25e0cdbd0b7504e30d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Apr 1 13:40:04 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Apr 1 13:40:10 2014 +0200

    Fix up test.

diff --git a/Tests/RunCMake/TargetSources/OriginDebug-stderr.txt b/Tests/RunCMake/TargetSources/OriginDebug-stderr.txt
index 3bb6bf4..0200dcb 100644
--- a/Tests/RunCMake/TargetSources/OriginDebug-stderr.txt
+++ b/Tests/RunCMake/TargetSources/OriginDebug-stderr.txt
@@ -1,7 +1,7 @@
 CMake Debug Log at OriginDebug.cmake:13 \(add_library\):
   Used sources for target OriginDebug:
 
-   \* empty_2.cpp
+   \* .*Tests/RunCMake/TargetSources/empty_2.cpp
 
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
@@ -9,7 +9,7 @@ Call Stack \(most recent call first\):
 CMake Debug Log at OriginDebug.cmake:16 \(set_property\):
   Used sources for target OriginDebug:
 
-   \* empty_3.cpp
+   \* .*Tests/RunCMake/TargetSources/empty_3.cpp
 
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
@@ -17,7 +17,7 @@ Call Stack \(most recent call first\):
 CMake Debug Log at OriginDebug.cmake:20 \(target_sources\):
   Used sources for target OriginDebug:
 
-   \* empty_4.cpp
+   \* .*Tests/RunCMake/TargetSources/empty_4.cpp
 
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
@@ -25,7 +25,7 @@ Call Stack \(most recent call first\):
 CMake Debug Log at OriginDebug.cmake:14 \(target_link_libraries\):
   Used sources for target OriginDebug:
 
-   \* empty_1.cpp
+   \* .*Tests/RunCMake/TargetSources/empty_1.cpp
 
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)

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

Summary of changes:
 Tests/RunCMake/TargetSources/OriginDebug-stderr.txt |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list