forked from osmocom/wireshark
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>
This commit is contained in:
parent
2eb6f3b5de
commit
f52bb2bf27
|
@ -14,7 +14,7 @@ FIND_PROGRAM(ASCIIDOCTOR_EXECUTABLE
|
|||
/bin
|
||||
/usr/bin
|
||||
/usr/local/bin
|
||||
${CHOCOLATEY_BIN_PATH}/bin
|
||||
${CHOCOLATEY_BIN_PATH}
|
||||
DOC "Path to Asciidoctor or AsciidoctorJ"
|
||||
)
|
||||
|
||||
|
|
|
@ -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 ()
|
||||
|
|
|
@ -11,7 +11,7 @@ FIND_PROGRAM(LEX_EXECUTABLE
|
|||
flex
|
||||
lex
|
||||
PATHS
|
||||
${CHOCOLATEY_BIN_PATH}/bin
|
||||
${CHOCOLATEY_BIN_PATH}
|
||||
${CYGWIN_INSTALL_PATH}/bin
|
||||
/bin
|
||||
/usr/bin
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
# This module looks for some usual Unix commands.
|
||||
#
|
||||
|
||||
include(FindChocolatey)
|
||||
include(FindCygwin)
|
||||
|
||||
# Strawberry Perl ships with xsltproc but no DocBook XML files, which
|
||||
|
@ -12,7 +13,7 @@ find_program(XSLTPROC_EXECUTABLE
|
|||
NAMES
|
||||
xsltproc
|
||||
HINTS
|
||||
${ChocolateyInstall}/bin
|
||||
${CHOCOLATEY_BIN_PATH}
|
||||
${CYGWIN_INSTALL_PATH}/bin
|
||||
PATHS
|
||||
/usr/local/bin
|
||||
|
|
|
@ -11,7 +11,7 @@ FIND_PROGRAM(YACC_EXECUTABLE
|
|||
bison
|
||||
yacc
|
||||
PATHS
|
||||
${CHOCOLATEY_BIN_PATH}/bin
|
||||
${CHOCOLATEY_BIN_PATH}
|
||||
${CYGWIN_INSTALL_PATH}/bin
|
||||
/bin
|
||||
/usr/bin
|
||||
|
|
Loading…
Reference in New Issue