[Cmake-commits] CMake branch, next, updated. v3.0.2-2133-g5e3d631

[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  5e3d631f78a11222f367d9e1f1c2320398d95f50 (commit)
       via  ed997de4f21620fb25f7380fd664bc3c1d2f8ec8 (commit)
      from  71a8397f8cc55d23ef221e861664a4c9f4254e0b (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=5e3d631f78a11222f367d9e1f1c2320398d95f50
commit 5e3d631f78a11222f367d9e1f1c2320398d95f50
Merge: 71a8397 ed997de
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 22 10:52:16 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 22 10:52:16 2014 -0400

    Merge topic 'FindHg-no-cygwin-hg-on-windows' into next
    
    ed997de4 FindHg: Do not use cygwin hg on Windows


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed997de4f21620fb25f7380fd664bc3c1d2f8ec8
commit ed997de4f21620fb25f7380fd664bc3c1d2f8ec8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 21 15:42:53 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 22 10:52:08 2014 -0400

    FindHg: Do not use cygwin hg on Windows
    
    The cygwin hg client is a text file with a '#!/bin/python" line.
    This cannot run on Windows.

diff --git a/Modules/FindHg.cmake b/Modules/FindHg.cmake
index c418afd..34d763e 100644
--- a/Modules/FindHg.cmake
+++ b/Modules/FindHg.cmake
@@ -66,7 +66,11 @@ if(HG_EXECUTABLE)
   execute_process(COMMAND ${HG_EXECUTABLE} --version
                   OUTPUT_VARIABLE hg_version
                   ERROR_QUIET
+                  RESULT_VARIABLE hg_result
                   OUTPUT_STRIP_TRAILING_WHITESPACE)
+  if(hg_result MATCHES "is not a valid Win32 application")
+    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:


hooks/post-receive
-- 
CMake