From ed997de4f21620fb25f7380fd664bc3c1d2f8ec8 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 21 Oct 2014 15:42:53 -0400 Subject: [PATCH] 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. --- Modules/FindHg.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Modules/FindHg.cmake b/Modules/FindHg.cmake index c418afdd2..34d763edc 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()