kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'FindHg-no-cygwin-hg-on-windows' into release

This commit is contained in:
Brad King 2014-10-22 13:39:33 -04:00
parent dae2bddf5a ed997de4f2
commit f18dbfee5c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/FindHg.cmake
View File

@ -66,7 +66,11 @@ if(HG_EXECUTABLE)
execute_process(COMMAND ${HG_EXECUTABLE} --version execute_process(COMMAND ${HG_EXECUTABLE} --version
OUTPUT_VARIABLE hg_version OUTPUT_VARIABLE hg_version
ERROR_QUIET ERROR_QUIET
RESULT_VARIABLE hg_result
OUTPUT_STRIP_TRAILING_WHITESPACE) 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][^)]*)\\)") if(hg_version MATCHES "^Mercurial Distributed SCM \\(version ([0-9][^)]*)\\)")
set(HG_VERSION_STRING "${CMAKE_MATCH_1}") set(HG_VERSION_STRING "${CMAKE_MATCH_1}")
endif() endif()