[Cmake-commits] CMake branch, next, updated. v3.2.0-840-g38305a8

[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  38305a812e6d79ce60b67130f9b6f5c37e32b39a (commit)
       via  fd2875d12dbc891b0d6faa6c84e813f12bcd9c2f (commit)
      from  6f6181e6fabf21ef75054f18c888bc9f7ab4b337 (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=38305a812e6d79ce60b67130f9b6f5c37e32b39a
commit 38305a812e6d79ce60b67130f9b6f5c37e32b39a
Merge: 6f6181e fd2875d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 4 18:13:27 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 4 18:13:27 2015 -0500

    Merge topic 'target-language-genex' into next
    
    fd2875d1 Fix test expections.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd2875d12dbc891b0d6faa6c84e813f12bcd9c2f
commit fd2875d12dbc891b0d6faa6c84e813f12bcd9c2f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 5 00:12:41 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Mar 5 00:12:41 2015 +0100

    Fix test expections.

diff --git a/Tests/RunCMake/File_Generate/OutputConflict-stderr.txt b/Tests/RunCMake/File_Generate/OutputConflict-stderr.txt
index dbd39de..0abb7df 100644
--- a/Tests/RunCMake/File_Generate/OutputConflict-stderr.txt
+++ b/Tests/RunCMake/File_Generate/OutputConflict-stderr.txt
@@ -1,5 +1,5 @@
 CMake Error in CMakeLists.txt:
   Evaluation file to be written multiple times for different configurations
-  with different content:
+  or languages with different content:
 
   .*output.txt

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

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


hooks/post-receive
-- 
CMake