[Cmake-commits] CMake branch, next, updated. v3.0.0-4171-gcd2351a

[Brad King]

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  cd2351a279d2cd5ad5a46f9c3680e4beebde42f6 (commit)
       via  e47ada5ba3d23a1dce733c58d637a8720b3e10cb (commit)
      from  e884baa631df6c5c9556eb9b3f351366e37bf92c (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=cd2351a279d2cd5ad5a46f9c3680e4beebde42f6
commit cd2351a279d2cd5ad5a46f9c3680e4beebde42f6
Merge: e884baa e47ada5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 10 09:01:28 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 10 09:01:28 2014 -0400

    Merge topic 'interface-sources-target-objects' into next
    
    e47ada5b Tests: Fix RunCMake.TargetObjects for multi-config generators


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e47ada5ba3d23a1dce733c58d637a8720b3e10cb
commit e47ada5ba3d23a1dce733c58d637a8720b3e10cb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 10 08:59:22 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 10 08:59:22 2014 -0400

    Tests: Fix RunCMake.TargetObjects for multi-config generators
    
    The generator expression error may be repeated for each configuration
    to be generated.  Update the expected output accordingly.

diff --git a/Tests/RunCMake/TargetObjects/BadContext-stderr.txt b/Tests/RunCMake/TargetObjects/BadContext-stderr.txt
index 2d31f79..b78189e 100644
--- a/Tests/RunCMake/TargetObjects/BadContext-stderr.txt
+++ b/Tests/RunCMake/TargetObjects/BadContext-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at BadContext.cmake:4 \(file\):
+(CMake Error at BadContext.cmake:4 \(file\):
   Error evaluating generator expression:
 
     \$<TARGET_OBJECTS:NoTarget>
@@ -7,8 +7,8 @@ CMake Error at BadContext.cmake:4 \(file\):
   for consumption by CMake.  It is not suitable for writing out elsewhere.
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
-+
-CMake Error at BadContext.cmake:5 \(file\):
+*)+
+(CMake Error at BadContext.cmake:5 \(file\):
   Error evaluating generator expression:
 
     \$<TARGET_OBJECTS:NoTarget>
@@ -17,7 +17,7 @@ CMake Error at BadContext.cmake:5 \(file\):
   for consumption by CMake.  It is not suitable for writing out elsewhere.
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
-+
+*)+
 CMake Error:
   Error evaluating generator expression:
 

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

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


hooks/post-receive
-- 
CMake