[Cmake-commits] CMake branch, next, updated. v3.0.2-2122-gfffc133
Brad King
brad.king at kitware.com
Tue Oct 21 15:18:13 EDT 2014
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 fffc133b68ab4d1169e0dd4ea893e3cb0afd4335 (commit)
via 06c13d5d747fb11c34f4249aee6ffce01e503a2c (commit)
from 018937405bfde0c2ba6d7f5407041a8e884a6b5b (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=fffc133b68ab4d1169e0dd4ea893e3cb0afd4335
commit fffc133b68ab4d1169e0dd4ea893e3cb0afd4335
Merge: 0189374 06c13d5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 21 15:18:12 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 21 15:18:12 2014 -0400
Merge topic 'ExternalProject-no-cygwin-hg-on-windows' into next
06c13d5d Tests/ExternalProject: Skip Windows hg tests with cygwin hg
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06c13d5d747fb11c34f4249aee6ffce01e503a2c
commit 06c13d5d747fb11c34f4249aee6ffce01e503a2c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 21 15:16:41 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 21 15:16:41 2014 -0400
Tests/ExternalProject: Skip Windows hg tests with cygwin hg
The cygwin hg client is a text file with a '#!/bin/python" line.
This cannot run on Windows.
diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt
index 2f74121..d2fa86a 100644
--- a/Tests/ExternalProject/CMakeLists.txt
+++ b/Tests/ExternalProject/CMakeLists.txt
@@ -372,6 +372,13 @@ if(HG_EXECUTABLE)
set(do_hg_tests 1)
endif()
+if(do_hg_tests AND NOT UNIX)
+ if("${HG_EXECUTABLE}" MATCHES "cygwin")
+ message(STATUS "No ExternalProject hg tests with cygwin hg outside cygwin!")
+ set(do_hg_tests 0)
+ endif()
+endif()
+
if(do_hg_tests)
set(local_hg_repo "../../LocalRepositories/HG")
-----------------------------------------------------------------------
Summary of changes:
Tests/ExternalProject/CMakeLists.txt | 7 +++++++
1 file changed, 7 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list