diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-15 17:55:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-08-15 17:55:54 (GMT) |
| commit | a428b87ccfa5fe186246f7faef42db11ba85fa74 (patch) | |
| tree | e9f3539ed0719e67c2e9bae0dc8f65905e4901fa | |
| parent | 8ebd590b211c26ea9a35a33d6f019e1909e0283c (diff) | |
| parent | 62930253a3d3eb983f846a3cf20f36e34c71cb9e (diff) | |
| download | CMake-a428b87ccfa5fe186246f7faef42db11ba85fa74.zip CMake-a428b87ccfa5fe186246f7faef42db11ba85fa74.tar.gz CMake-a428b87ccfa5fe186246f7faef42db11ba85fa74.tar.bz2 | |
Merge branch 'backport-FindCygwin-fix-regression' into FindCygwin-fix-regression
| -rw-r--r-- | Modules/FindCygwin.cmake | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Modules/FindCygwin.cmake b/Modules/FindCygwin.cmake index 086c7dc..092a3bd 100644 --- a/Modules/FindCygwin.cmake +++ b/Modules/FindCygwin.cmake @@ -8,7 +8,11 @@ # this module looks for Cygwin if (WIN32) - find_program(CYGWIN_INSTALL_PATH + if(CYGWIN_INSTALL_PATH) + set(CYGWIN_BAT "${CYGWIN_INSTALL_PATH}/cygwin.bat") + endif() + + find_program(CYGWIN_BAT NAMES cygwin.bat PATHS "C:/Cygwin" @@ -16,8 +20,7 @@ if (WIN32) "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Cygwin\\setup;rootdir]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Cygnus Solutions\\Cygwin\\mounts v2\\/;native]" ) - get_filename_component(CYGWIN_INSTALL_PATH "${CYGWIN_INSTALL_PATH}" DIRECTORY) - mark_as_advanced( - CYGWIN_INSTALL_PATH - ) + get_filename_component(CYGWIN_INSTALL_PATH "${CYGWIN_BAT}" DIRECTORY) + mark_as_advanced(CYGWIN_BAT) + endif () |