[Cmake-commits] CMake branch, next, updated. v3.0.2-2124-gffa1da0

[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  ffa1da029374525f53556253b6e2d83c617991e4 (commit)
       via  fbe7f4d4aa4c049a5a9449a828f04580a0d33af4 (commit)
      from  fffc133b68ab4d1169e0dd4ea893e3cb0afd4335 (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=ffa1da029374525f53556253b6e2d83c617991e4
commit ffa1da029374525f53556253b6e2d83c617991e4
Merge: fffc133 fbe7f4d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 21 15:44:05 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 21 15:44:05 2014 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fbe7f4d4aa4c049a5a9449a828f04580a0d33af4
commit fbe7f4d4aa4c049a5a9449a828f04580a0d33af4
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: Tue Oct 21 15:43:43 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:
 Modules/FindHg.cmake |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake