diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-08-07 14:07:16 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-08-07 21:54:54 +0000 |
| commit | 714fa85d85225307af42e2194e551b8087e617dd (patch) | |
| tree | 7ff8c9477fad1141b6cb2e8b2f89dc0c388849da /cmake | |
| parent | 1dc88edc2c3283620adc941a38d5c26cdc1e79c4 (diff) | |
Win flex-bison and Chocolatey updates.
Chocolatey's latest winflexbison package is usable. Update
config.nmake, FindLEX.cmake, and FindYACC.cmake accordingly. Rename
CHOCOLATEY_INSTALL_PATH to CHOCOLATEY_BIN_PATH since that's what we're
finding.
Change-Id: I39973fba0531b3f7a1315ca010a8bd70581db3fb
Reviewed-on: https://code.wireshark.org/review/3479
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindChocolatey.cmake | 12 | ||||
| -rw-r--r-- | cmake/modules/FindLEX.cmake | 12 | ||||
| -rw-r--r-- | cmake/modules/FindYACC.cmake | 13 |
3 files changed, 12 insertions, 25 deletions
diff --git a/cmake/modules/FindChocolatey.cmake b/cmake/modules/FindChocolatey.cmake index e0c0b291b5..9f486dbd84 100644 --- a/cmake/modules/FindChocolatey.cmake +++ b/cmake/modules/FindChocolatey.cmake @@ -1,7 +1,7 @@ # FindChocolatey # ---------- # -# this module looks for Chocolatey +# This module looks for Chocolatey # This code was copied from # http://cmake.org/gitweb?p=cmake.git;a=blob_plain;f=Modules/FindCygwin.cmake;hb=HEAD @@ -22,15 +22,15 @@ # License text for the above reference.) if (WIN32) - find_path(CHOCOLATEY_INSTALL_PATH - choco.bat - PATH "C:/Chocolatey" ENV ChocolateyInstall + find_path(CHOCOLATEY_BIN_PATH + choco.exe + PATHS "C:/ProgramData/chocolatey" "C:/Chocolatey" ENV ChocolateyInstall PATH_SUFFIXES bin - DOC "Chocolatey installation path" + DOC "Chocolatey binary path" NO_DEFAULT_PATH ) mark_as_advanced( - CHOCOLATEY_INSTALL_PATH + CHOCOLATEY_BIN_PATH ) endif () diff --git a/cmake/modules/FindLEX.cmake b/cmake/modules/FindLEX.cmake index 1c413b716b..c540011041 100644 --- a/cmake/modules/FindLEX.cmake +++ b/cmake/modules/FindLEX.cmake @@ -1,14 +1,9 @@ # -# - Find lex executable +# - Find flex/lex executable # INCLUDE(FindCygwin) -#INCLUDE(FindChocolatey) - -# Chocolatey's C:\Chocolatey\bin\win_flex and -\win_bison are -# currently unusable without some manual adjustments to the -# win_flex and win_bison wrapper scripts. Calling the executables -# directly should work. +INCLUDE(FindChocolatey) FIND_PROGRAM(LEX_EXECUTABLE NAMES @@ -16,9 +11,8 @@ FIND_PROGRAM(LEX_EXECUTABLE win_flex lex PATHS + ${CHOCOLATEY_BIN_PATH}/bin ${CYGWIN_INSTALL_PATH}/bin -# ${CHOCOLATEY_INSTALL_PATH}/bin -# ${CHOCOLATEY_INSTALL_PATH}/lib/winflexbison.2.4.1.20140103/tools /bin /usr/bin /usr/local/bin diff --git a/cmake/modules/FindYACC.cmake b/cmake/modules/FindYACC.cmake index 17b56417b4..672a780e7d 100644 --- a/cmake/modules/FindYACC.cmake +++ b/cmake/modules/FindYACC.cmake @@ -1,15 +1,9 @@ # -# - Find unix commands from cygwin -# This module looks for some usual Unix commands. +# - Find bison/yacc executable # INCLUDE(FindCygwin) -#INCLUDE(FindChocolatey) - -# Chocolatey's C:\Chocolatey\bin\win_flex and -\win_bison are -# currently unusable without some manual adjustments to the -# win_flex and win_bison wrapper scripts. Calling the executables -# directly should work. +INCLUDE(FindChocolatey) FIND_PROGRAM(YACC_EXECUTABLE NAMES @@ -17,9 +11,8 @@ FIND_PROGRAM(YACC_EXECUTABLE win_bison yacc PATHS + ${CHOCOLATEY_BIN_PATH}/bin ${CYGWIN_INSTALL_PATH}/bin -# ${CHOCOLATEY_INSTALL_PATH}/bin -# ${CHOCOLATEY_INSTALL_PATH}/lib/winflexbison.2.4.1.20140103/tools /bin /usr/bin /usr/local/bin |