reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-25 14:41:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'FindCygwin-fix-regression'

Browse Source 
a428b87c Merge branch 'backport-FindCygwin-fix-regression' into FindCygwin-fix-regression
62930253 FindCygwin: Fix regression when CYGWIN_INSTALL_PATH is already set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1128
This commit is contained in:
Brad King 2017-08-16 14:47:28 +00:00 committed by Kitware Robot
commit b034e22f36
1 changed files with 8 additions and 5 deletions
Show Stats 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 ()