[Cmake-commits] CMake branch, next, updated. v2.8.12.1-4894-gf18fe19
Stephen Kelly
steveire at gmail.com
Thu Nov 7 05:06:27 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 f18fe19ee36c630ffa251412fdd190723b1d549e (commit)
via b2ada6aa363f4bd6ee89f9b178c80d273e799b77 (commit)
from e590fdc5e8048f3e74264648ff8699fd44908b8a (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=f18fe19ee36c630ffa251412fdd190723b1d549e
commit f18fe19ee36c630ffa251412fdd190723b1d549e
Merge: e590fdc b2ada6a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 7 05:06:25 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 7 05:06:25 2013 -0500
Merge topic 'tll-target-policies' into next
b2ada6a Simplify and expand test exclusion
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b2ada6aa363f4bd6ee89f9b178c80d273e799b77
commit b2ada6aa363f4bd6ee89f9b178c80d273e799b77
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 7 11:05:40 2013 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 7 11:05:40 2013 +0100
Simplify and expand test exclusion
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index ed06745..6e72e70 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -56,8 +56,7 @@ add_RunCMake_test(CMP0022)
add_RunCMake_test(CMP0026)
add_RunCMake_test(CMP0027)
add_RunCMake_test(CMP0028)
-if (NOT "${CMAKE_TEST_GENERATOR}" MATCHES "Borland"
- AND NOT "${CMAKE_TEST_GENERATOR}" MATCHES "NMake")
+if (NOT "${CMAKE_TEST_GENERATOR}" MATCHES "(MSYS|MinGW|NMake|Borland) Makefiles")
add_RunCMake_test(CMP0037)
endif()
add_RunCMake_test(CMP0038)
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CMakeLists.txt | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list