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 620f112bfee9c66dc0f86eefc9fd1dcaa4faa436 (commit)
via aac903001cadb9c9ed166ac9cafa1466a59d806a (commit)
from bb1bffebea884264d5b789c70893606e8c2d7fc6 (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=620f112bfee9c66dc0f86eefc9fd1dcaa4faa436
commit 620f112bfee9c66dc0f86eefc9fd1dcaa4faa436
Merge: bb1bffe aac9030
Author: Brad King <[email protected]>
AuthorDate: Wed Jul 29 08:51:58 2015 -0400
Commit: CMake Topic Stage <[email protected]>
CommitDate: Wed Jul 29 08:51:58 2015 -0400
Merge topic 'update-kwsys' into next
aac90300 FindHg: Update rejection of cygwin hg on Windows
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aac903001cadb9c9ed166ac9cafa1466a59d806a
commit aac903001cadb9c9ed166ac9cafa1466a59d806a
Author: Brad King <[email protected]>
AuthorDate: Tue Jul 28 09:45:26 2015 -0400
Commit: Brad King <[email protected]>
CommitDate: Tue Jul 28 09:45:26 2015 -0400
FindHg: Update rejection of cygwin hg on Windows
The cygwin hg client is a text file with a '#!/bin/python" line. This
cannot run on Windows. Since KWSys commit faff2ab0 (Process: Wait for
children to terminate on Ctrl+C, 2015-06-30) the execute_process result
value is different in this case. Update our check to account for it,
at least until that is addressed.
diff --git a/Modules/FindHg.cmake b/Modules/FindHg.cmake
index bdbb79b..663e7af 100644
--- a/Modules/FindHg.cmake
+++ b/Modules/FindHg.cmake
@@ -81,6 +81,9 @@ if(HG_EXECUTABLE)
if(hg_result MATCHES "is not a valid Win32 application")
set_property(CACHE HG_EXECUTABLE PROPERTY VALUE "HG_EXECUTABLE-NOTFOUND")
endif()
+ if(hg_result MATCHES "The handle is invalid")
+ set_property(CACHE HG_EXECUTABLE PROPERTY VALUE "HG_EXECUTABLE-NOTFOUND")
+ endif()
if(hg_version MATCHES "^Mercurial Distributed SCM \\(version
([0-9][^)]*)\\)")
set(HG_VERSION_STRING "${CMAKE_MATCH_1}")
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindHg.cmake | 3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
