URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f52bb2bf27cc55285398bbf6acb1884b10b8d3a4
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
f52bb2b by Gerald Combs (gerald@xxxxxxxxxxxxx):
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@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
Actions performed:
from 2eb6f3b CMake: Remove SH from the packate list.
adds f52bb2b CMake: Fixup our Chocolatey bin path discovery.
Summary of changes:
cmake/modules/FindAsciidoctor.cmake | 2 +-
cmake/modules/FindChocolatey.cmake | 26 ++++++++++++++++----------
cmake/modules/FindLEX.cmake | 2 +-
cmake/modules/FindXSLTPROC.cmake | 3 ++-
cmake/modules/FindYACC.cmake | 2 +-
5 files changed, 21 insertions(+), 14 deletions(-)