diff options
author | Gerald Combs <gerald@wireshark.org> | 2015-11-16 12:52:49 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2015-11-17 01:37:00 +0000 |
commit | 9a7973770e19dca8ee455d60efb0b46c3bafef98 (patch) | |
tree | e79676d257e79d3440e53ca12737712e2b27c907 | |
parent | 1aeb3cb9897ce23b397f308d6c1886400c863e1b (diff) |
CMake: Add "C:/tools/cygwin" to FindCygwin.cmake.
Add C:\tools\cygwin to the list of search paths in FindCygwin.cmake.
This matches the behavior of config.nmake and is where Chocolatey
installs Cygwin.
Change-Id: I87a3cd64aae410b9c9abdc87c56d29aa3c4d5946
Reviewed-on: https://code.wireshark.org/review/11885
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r-- | cmake/modules/FindCygwin.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmake/modules/FindCygwin.cmake b/cmake/modules/FindCygwin.cmake index e568615ae2..bc50ac5cdf 100644 --- a/cmake/modules/FindCygwin.cmake +++ b/cmake/modules/FindCygwin.cmake @@ -50,6 +50,7 @@ if (WIN32) 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]" ) |