[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1696-gd22f5db

[Stephen Kelly]

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  d22f5db5ce34558addc2325abb4f26125d4163fe (commit)
       via  1570aaad4f825e91032e5e1b6d7c17b9e53d10cb (commit)
      from  3001e34fdebb5a54f7725b98090f3cf8da8a63ef (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=d22f5db5ce34558addc2325abb4f26125d4163fe
commit d22f5db5ce34558addc2325abb4f26125d4163fe
Merge: 3001e34 1570aaa
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Apr 1 07:46:04 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 1 07:46:04 2014 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1570aaad4f825e91032e5e1b6d7c17b9e53d10cb
commit 1570aaad4f825e91032e5e1b6d7c17b9e53d10cb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Apr 1 13:45:37 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Apr 1 13:45:37 2014 +0200

    Fix up test.

diff --git a/Tests/RunCMake/TargetSources/OriginDebugIDE-stderr.txt b/Tests/RunCMake/TargetSources/OriginDebugIDE-stderr.txt
index 358bfb3..fad7073 100644
--- a/Tests/RunCMake/TargetSources/OriginDebugIDE-stderr.txt
+++ b/Tests/RunCMake/TargetSources/OriginDebugIDE-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\):
   OriginDebugIDE.cmake:4 \(include\)
@@ -10,7 +10,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\):
   OriginDebugIDE.cmake:4 \(include\)
@@ -19,7 +19,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\):
   OriginDebugIDE.cmake:4 \(include\)
@@ -33,7 +33,7 @@ CMake Debug Log:
 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\):
   OriginDebugIDE.cmake:4 \(include\)

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

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


hooks/post-receive
-- 
CMake