[Cmake-commits] CMake branch, next, updated. v2.8.12.1-4886-gae6de0e

Stephen Kelly steveire at gmail.com
Wed Nov 6 16:25:57 EST 2013


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  ae6de0eaaa1e0e67881f06d75bcf4bc87707faab (commit)
       via  d72ac5bf9ee79683deff6eb2167f5f5859d5c42f (commit)
      from  8403a52cf9577e30c1fb8efa5d5e15a2162b5cac (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=ae6de0eaaa1e0e67881f06d75bcf4bc87707faab
commit ae6de0eaaa1e0e67881f06d75bcf4bc87707faab
Merge: 8403a52 d72ac5b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 6 16:25:54 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 6 16:25:54 2013 -0500

    Merge topic 'tll-target-policies' into next
    
    d72ac5b Exclude Borland and NMake from the CMP0037 test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d72ac5bf9ee79683deff6eb2167f5f5859d5c42f
commit d72ac5bf9ee79683deff6eb2167f5f5859d5c42f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 6 22:23:39 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Nov 6 22:23:39 2013 +0100

    Exclude Borland and NMake from the CMP0037 test.
    
    They do not accept the colon in a target name.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index bf3dcc1..ed06745 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -56,7 +56,10 @@ add_RunCMake_test(CMP0022)
 add_RunCMake_test(CMP0026)
 add_RunCMake_test(CMP0027)
 add_RunCMake_test(CMP0028)
-add_RunCMake_test(CMP0037)
+if (NOT "${CMAKE_TEST_GENERATOR}" MATCHES "Borland"
+    AND NOT "${CMAKE_TEST_GENERATOR}" MATCHES "NMake")
+  add_RunCMake_test(CMP0037)
+endif()
 add_RunCMake_test(CMP0038)
 add_RunCMake_test(CMP0039)
 add_RunCMake_test(CTest)

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list