diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-03-06 09:34:36 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-03-06 19:00:56 +0000 |
| commit | f52bb2bf27cc55285398bbf6acb1884b10b8d3a4 (patch) | |
| tree | 0555dfbffdb070841725d4f56dc51392c1deca63 /cmake/modules/FindLEX.cmake | |
| parent | 2eb6f3b5de46bb4d52775df919e2a55a3f606d9c (diff) | |
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>
Diffstat (limited to 'cmake/modules/FindLEX.cmake')
| -rw-r--r-- | cmake/modules/FindLEX.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/modules/FindLEX.cmake b/cmake/modules/FindLEX.cmake index 3ec7db30c5..f7d010b732 100644 --- a/cmake/modules/FindLEX.cmake +++ b/cmake/modules/FindLEX.cmake @@ -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 |