diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-07-31 10:09:32 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2017-08-01 22:28:29 +0000 |
| commit | 7c5ff646dc6328233da09d9fc9b68c25eec8a9ba (patch) | |
| tree | 51a823125a789e02c08010a6e253e69a0dfd0695 /cmake | |
| parent | f24c1564bd9e71176bbff781e0e38cd0e29e9fa3 (diff) | |
Look for Cygwin in one more place.
Add "HKLM\SOFTWARE\WOW6432Node\Cygwin\setup" to the Cygwin search paths.
Change-Id: I302ecea67dd580449b450136c027ac37adf586d3
Reviewed-on: https://code.wireshark.org/review/22893
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindCygwin.cmake | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/cmake/modules/FindCygwin.cmake b/cmake/modules/FindCygwin.cmake index 511c8bb182..5c33f32248 100644 --- a/cmake/modules/FindCygwin.cmake +++ b/cmake/modules/FindCygwin.cmake @@ -46,13 +46,15 @@ if (WIN32) find_path(CYGWIN_INSTALL_PATH - cygwin.bat - PATH ENV WIRESHARK_CYGWIN_INSTALL_PATH - "C:/Cygwin" - "C:/Cygwin64" - "C:/tools/cygwin" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Cygwin\\setup;rootdir]" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Cygnus Solutions\\Cygwin\\mounts v2\\/;native]" + NAMES cygwin.bat + PATHS + ENV WIRESHARK_CYGWIN_INSTALL_PATH + "C:/Cygwin" + "C:/Cygwin64" + "C:/tools/cygwin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Cygwin\\setup;rootdir]" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\Cygwin\\setup;rootdir]" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Cygnus Solutions\\Cygwin\\mounts v2\\/;native]" ) if(NOT CYGWIN_INSTALL_PATH) |