summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-05-25 19:15:06 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-05-25 19:15:16 (GMT)
commit1f6509142d4ace26ce134e1c768e5f2249b8a08b (patch)
tree22542b20f9a7f8dae28c515ddbe40a6058349d4d
parentdef409af76c3222d3635b64398121190345f7c70 (diff)
parentd303465448504d3f91e2991e80a72a3d569f3866 (diff)
downloadCMake-1f6509142d4ace26ce134e1c768e5f2249b8a08b.zip
CMake-1f6509142d4ace26ce134e1c768e5f2249b8a08b.tar.gz
CMake-1f6509142d4ace26ce134e1c768e5f2249b8a08b.tar.bz2
Merge topic 'FindCygwin-alt-arch'
d3034654 FindCygwin: Use find_program instead of find_path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !883
-rw-r--r--Modules/FindCygwin.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindCygwin.cmake b/Modules/FindCygwin.cmake
index 90cbd52..b2ed703 100644
--- a/Modules/FindCygwin.cmake
+++ b/Modules/FindCygwin.cmake
@@ -8,13 +8,13 @@
# this module looks for Cygwin
if (WIN32)
- find_path(CYGWIN_INSTALL_PATH
+ find_program(CYGWIN_INSTALL_PATH
cygwin.bat
"C:/Cygwin"
"[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
)