[Cmake-commits] CMake branch, next, updated. v3.0.2-2135-g81df86a
Brad King
brad.king at kitware.com
Wed Oct 22 10:52:46 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 81df86a3b0cddd775a5173a08ac90e32e1f5c4d9 (commit)
via ad984b60edaeac622fd87532899e52a3ff220a70 (commit)
from 5e3d631f78a11222f367d9e1f1c2320398d95f50 (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=81df86a3b0cddd775a5173a08ac90e32e1f5c4d9
commit 81df86a3b0cddd775a5173a08ac90e32e1f5c4d9
Merge: 5e3d631 ad984b6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 22 10:52:45 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 22 10:52:45 2014 -0400
Merge topic 'ExternalProject-no-cygwin-hg-on-windows' into next
ad984b60 Tests/ExternalProject: Skip Windows hg tests with cygwin hg
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad984b60edaeac622fd87532899e52a3ff220a70
commit ad984b60edaeac622fd87532899e52a3ff220a70
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: Wed Oct 22 10:52:28 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:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list