[Cmake-commits] CMake branch, next, updated. v2.8.2-975-gd3d1532

[Ben Boeckel]

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  d3d1532b03c4cb2d7a6be83dcdd7c4f65bd09f14 (commit)
       via  d3a89432fd5d35a33ee37bca78bbc2cafa113c42 (commit)
      from  4a29eb664d7322615d031e1b38e851dad9255d91 (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=d3d1532b03c4cb2d7a6be83dcdd7c4f65bd09f14
commit d3d1532b03c4cb2d7a6be83dcdd7c4f65bd09f14
Merge: 4a29eb6 d3a8943
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Sep 30 11:42:33 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 30 11:42:33 2010 -0400

    Merge topic 'dev/test-for-bug-11230' into next
    
    d3a8943 Fix which string is checked for in the test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3a89432fd5d35a33ee37bca78bbc2cafa113c42
commit d3a89432fd5d35a33ee37bca78bbc2cafa113c42
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Sep 30 11:39:26 2010 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Sep 30 11:39:26 2010 -0400

    Fix which string is checked for in the test
    
    GNU Makefiles have an extra line that Visual Studio doesn't output.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 4de9ac3..c056e86 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -155,7 +155,7 @@ IF(BUILD_TESTING)
   ADD_TEST_MACRO(PolicyScope PolicyScope)
   ADD_TEST_MACRO(EmptyLibrary EmptyLibrary)
   SET_TESTS_PROPERTIES(EmptyLibrary PROPERTIES
-    PASS_REGULAR_EXPRESSION "CMake Error: Cannot determine link language for target \"test\"")
+    PASS_REGULAR_EXPRESSION "CMake Error: CMake can not determine linker language for target:test")
   ADD_TEST_MACRO(CrossCompile CrossCompile)
   SET_TESTS_PROPERTIES(CrossCompile PROPERTIES
     PASS_REGULAR_EXPRESSION "TRY_RUN.. invoked in cross-compiling mode")

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

Summary of changes:
 Tests/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake