[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5033-g3406e93

[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  3406e933c176615cae24081f56f813821aea5675 (commit)
       via  5045e7c81e95994c20affa1b97412053f32aaa4d (commit)
      from  9a65a0953a6f0e509ab7162d9db9928c89d10f33 (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=3406e933c176615cae24081f56f813821aea5675
commit 3406e933c176615cae24081f56f813821aea5675
Merge: 9a65a09 5045e7c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Nov 10 08:49:50 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Nov 10 08:49:50 2013 -0500

    Merge topic 'test-RunCMake.CMP0037-everywhere' into next
    
    5045e7c RunCMake.CMP0037: Disable WARN-colon on all Windows Make tools


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5045e7c81e95994c20affa1b97412053f32aaa4d
commit 5045e7c81e95994c20affa1b97412053f32aaa4d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Nov 10 08:47:22 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Nov 10 08:47:43 2013 -0500

    RunCMake.CMP0037: Disable WARN-colon on all Windows Make tools
    
    No Makefile generator on Windows can generate targets with ':'
    in their name because the CMakeFiles/<target>.dir directory cannot
    be created.  Skip this part of the test on all Windows Make tools.

diff --git a/Tests/RunCMake/CMP0037/RunCMakeTest.cmake b/Tests/RunCMake/CMP0037/RunCMakeTest.cmake
index 704a4f6..fbb1788 100644
--- a/Tests/RunCMake/CMP0037/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CMP0037/RunCMakeTest.cmake
@@ -5,7 +5,6 @@ run_cmake(CMP0037-NEW-space)
 run_cmake(CMP0037-WARN-space)
 run_cmake(CMP0037-NEW-colon)
 
-if(NOT "${RunCMake_GENERATOR}" MATCHES
-    "((MSYS|MinGW|NMake|Borland) Makefiles|Watcom WMake)")
+if(NOT (WIN32 AND "${RunCMake_GENERATOR}" MATCHES "Make"))
   run_cmake(CMP0037-WARN-colon)
 endif()

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

Summary of changes:
 Tests/RunCMake/CMP0037/RunCMakeTest.cmake |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake