From 7514f98f563bf480b28214e883e9e100d0cdcdf9 Mon Sep 17 00:00:00 2001 From: Graham Bloice Date: Sat, 17 Sep 2016 18:54:41 +0100 Subject: [PATCH] Make Winflex\bison the preferred option Cygwin flex\bison generate shortening warnings due to size_t on Win 64. The win flex\bison versions don't so find them first. Change-Id: Ib68c84435f859325612410b72b6cf21cf106ecc2 Reviewed-on: https://code.wireshark.org/review/17763 Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice --- cmake/modules/FindLEX.cmake | 2 +- cmake/modules/FindYACC.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/modules/FindLEX.cmake b/cmake/modules/FindLEX.cmake index adeb75c07a..6a9c0fc702 100644 --- a/cmake/modules/FindLEX.cmake +++ b/cmake/modules/FindLEX.cmake @@ -7,8 +7,8 @@ INCLUDE(FindChocolatey) FIND_PROGRAM(LEX_EXECUTABLE NAMES - flex win_flex + flex lex PATHS ${CHOCOLATEY_BIN_PATH}/bin diff --git a/cmake/modules/FindYACC.cmake b/cmake/modules/FindYACC.cmake index dca1c09fa8..b32fd4d4e9 100644 --- a/cmake/modules/FindYACC.cmake +++ b/cmake/modules/FindYACC.cmake @@ -7,8 +7,8 @@ INCLUDE(FindChocolatey) FIND_PROGRAM(YACC_EXECUTABLE NAMES - bison win_bison + bison yacc PATHS ${CHOCOLATEY_BIN_PATH}/bin