diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-03-06 09:34:36 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-03-06 19:00:56 +0000 |
| commit | f52bb2bf27cc55285398bbf6acb1884b10b8d3a4 (patch) | |
| tree | 0555dfbffdb070841725d4f56dc51392c1deca63 /cmake/modules/FindChocolatey.cmake | |
| parent | 2eb6f3b5de46bb4d52775df919e2a55a3f606d9c (diff) | |
CMake: Fixup our Chocolatey bin path discovery.
Search for choco.exe directly instead of using PATHS + PATH_SUFFIXES.
Look in %ChocolateyInstall%\bin first. CHOCOLATEY_BIN_PATH is the binary
path. There's no need to append /bin to it.
Change-Id: I732db398bd989bf12222a5cee2c79c0bd4161638
Reviewed-on: https://code.wireshark.org/review/26276
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'cmake/modules/FindChocolatey.cmake')
| -rw-r--r-- | cmake/modules/FindChocolatey.cmake | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/cmake/modules/FindChocolatey.cmake b/cmake/modules/FindChocolatey.cmake index 9f486dbd84..172335f9b9 100644 --- a/cmake/modules/FindChocolatey.cmake +++ b/cmake/modules/FindChocolatey.cmake @@ -22,15 +22,21 @@ # License text for the above reference.) if (WIN32) - find_path(CHOCOLATEY_BIN_PATH - choco.exe - PATHS "C:/ProgramData/chocolatey" "C:/Chocolatey" ENV ChocolateyInstall - PATH_SUFFIXES bin - DOC "Chocolatey binary path" - NO_DEFAULT_PATH - ) + if (ENV{ChocolateyInstall}) + set(_chocolateyinstall_bin "$ENV{ChocolateyInstall}/bin") + endif() - mark_as_advanced( - CHOCOLATEY_BIN_PATH - ) + find_path(CHOCOLATEY_BIN_PATH + choco.exe + PATHS + $_chocolateyinstall_bin + "$ENV{ProgramData}/chocolatey/bin" + C:/Chocolatey/bin + DOC "Chocolatey binary path" + NO_DEFAULT_PATH + ) + + mark_as_advanced( + CHOCOLATEY_BIN_PATH + ) endif () |