diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-04 13:24:22 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-04 13:24:25 (GMT) |
| commit | c2cc7645820ba762bdaaba62fa860bd00b909a39 (patch) | |
| tree | 38d1febec6e40fc6aee19a86b9961f824e3e2329 | |
| parent | 51f08783c2982c55c86b0d2d04bfbbf81bfbc815 (diff) | |
| parent | 0184531a6334075fdf572198a78065b9f494036d (diff) | |
| download | CMake-c2cc7645820ba762bdaaba62fa860bd00b909a39.zip CMake-c2cc7645820ba762bdaaba62fa860bd00b909a39.tar.gz CMake-c2cc7645820ba762bdaaba62fa860bd00b909a39.tar.bz2 | |
Merge topic 'FindCygwin-64-bit'
0184531a FindCygwin: Look for Cygwin in C:\Cygwin64.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1091
| -rw-r--r-- | Modules/FindCygwin.cmake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Modules/FindCygwin.cmake b/Modules/FindCygwin.cmake index b2ed703..086c7dc 100644 --- a/Modules/FindCygwin.cmake +++ b/Modules/FindCygwin.cmake @@ -9,10 +9,12 @@ if (WIN32) 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]" + NAMES cygwin.bat + PATHS + "C:/Cygwin" + "C:/Cygwin64" + "[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( |