mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-30 18:29:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-FindCygwin-fix-regression' into FindCygwin-fix-regression

Browse Source
This commit is contained in:
Brad King
2017-08-15 13:55:54 -04:00
parent 8ebd590b21 62930253a3
commit a428b87ccf
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Modules/FindCygwin.cmake
View File

@@ -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 ()