diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-22 17:39:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-10-22 17:39:33 (GMT) |
| commit | f18dbfee5c49279120104fb0bf665ccdae928184 (patch) | |
| tree | ce959bafd307796f29dc1edeb36eae4486217f0a | |
| parent | dae2bddf5a53f1d891452bbf1c64e65e7833e9c9 (diff) | |
| parent | ed997de4f21620fb25f7380fd664bc3c1d2f8ec8 (diff) | |
| download | CMake-f18dbfee5c49279120104fb0bf665ccdae928184.zip CMake-f18dbfee5c49279120104fb0bf665ccdae928184.tar.gz CMake-f18dbfee5c49279120104fb0bf665ccdae928184.tar.bz2 | |
Merge branch 'FindHg-no-cygwin-hg-on-windows' into release
| -rw-r--r-- | Modules/FindHg.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
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() |