Commit Graph

4 Commits

Author SHA1 Message Date
Gerald Combs f52bb2bf27 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>
2018-03-06 19:00:56 +00:00
Gerald Combs 714fa85d85 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>
2014-08-07 21:54:54 +00:00
Graham Bloice 4e64448f09 Fix a small typo in the FindChocolatey.cmake module
Change-Id: Idefea86a9f65f59432db4bf32b9f702298409cdb
Reviewed-on: https://code.wireshark.org/review/2980
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-10 11:44:09 +00:00
Gerald Combs 8db4bc2499 More Chocolatey lex/yacc updates.
Add Windows-style path handling to runlex.sh. Update the example
Chocolatey LEX path accordingly. This lets us use path information in
LEX and have it work in both nmake and runlex.sh

Add a FindChocolatey.cmake module. Update FindLEX and FindYACC to use it.
The code is currently untested and commented out.

svn path=/trunk/; revision=54828
2014-01-16 18:57:29 +00:00