osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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:
Gerald Combs 2018-03-06 09:34:36 -08:00
parent 2eb6f3b5de
commit f52bb2bf27
5 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/modules/FindAsciidoctor.cmake
View File

@ -14,7 +14,7 @@ FIND_PROGRAM(ASCIIDOCTOR_EXECUTABLE
/bin /bin
/usr/bin /usr/bin
/usr/local/bin /usr/local/bin
${CHOCOLATEY_BIN_PATH}/bin ${CHOCOLATEY_BIN_PATH}
DOC "Path to Asciidoctor or AsciidoctorJ" DOC "Path to Asciidoctor or AsciidoctorJ"
) )

26
cmake/modules/FindChocolatey.cmake
View File

@ -22,15 +22,21 @@
# License text for the above reference.) # License text for the above reference.)
if (WIN32) if (WIN32)
find_path(CHOCOLATEY_BIN_PATH if (ENV{ChocolateyInstall})
choco.exe set(_chocolateyinstall_bin "$ENV{ChocolateyInstall}/bin")
PATHS "C:/ProgramData/chocolatey" "C:/Chocolatey" ENV ChocolateyInstall endif()
PATH_SUFFIXES bin
DOC "Chocolatey binary path"
NO_DEFAULT_PATH
)
mark_as_advanced( find_path(CHOCOLATEY_BIN_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 () endif ()

2
cmake/modules/FindLEX.cmake
View File

@ -11,7 +11,7 @@ FIND_PROGRAM(LEX_EXECUTABLE
flex flex
lex lex
PATHS PATHS
${CHOCOLATEY_BIN_PATH}/bin ${CHOCOLATEY_BIN_PATH}
${CYGWIN_INSTALL_PATH}/bin ${CYGWIN_INSTALL_PATH}/bin
/bin /bin
/usr/bin /usr/bin

3
cmake/modules/FindXSLTPROC.cmake
View File

@ -3,6 +3,7 @@
# This module looks for some usual Unix commands. # This module looks for some usual Unix commands.
# #
include(FindChocolatey)
include(FindCygwin) include(FindCygwin)
# Strawberry Perl ships with xsltproc but no DocBook XML files, which # Strawberry Perl ships with xsltproc but no DocBook XML files, which
@ -12,7 +13,7 @@ find_program(XSLTPROC_EXECUTABLE
NAMES NAMES
xsltproc xsltproc
HINTS HINTS
${ChocolateyInstall}/bin ${CHOCOLATEY_BIN_PATH}
${CYGWIN_INSTALL_PATH}/bin ${CYGWIN_INSTALL_PATH}/bin
PATHS PATHS
/usr/local/bin /usr/local/bin

2
cmake/modules/FindYACC.cmake
View File

@ -11,7 +11,7 @@ FIND_PROGRAM(YACC_EXECUTABLE
bison bison
yacc yacc
PATHS PATHS
${CHOCOLATEY_BIN_PATH}/bin ${CHOCOLATEY_BIN_PATH}
${CYGWIN_INSTALL_PATH}/bin ${CYGWIN_INSTALL_PATH}/bin
/bin /bin
/usr/bin /usr/bin