From 46b105d51334efe1af4fbe6f6c02073980120721 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Mon, 24 Apr 2017 19:17:25 +0200 Subject: Remove runlex.sh script, just run lex directly This removes the need for sh (and Cygwin) on Windows to build Wireshark. runlex.sh (added in commits 5be4499a and 517d6d57) was added because older flex had quirks with its options (and the --header(-file) option was not available). The minimum required flex version for reentrant scanners (2.5.6) does not have these issues though, so remove the step. Change-Id: I73c82bb329e2130481efca94809dc60b86dcbafe Reviewed-on: https://code.wireshark.org/review/21315 Petri-Dish: Peter Wu Reviewed-by: Guy Harris Reviewed-by: Peter Wu --- cmake/modules/FindLEX.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'cmake') diff --git a/cmake/modules/FindLEX.cmake b/cmake/modules/FindLEX.cmake index 28fc6678fb..3ec7db30c5 100644 --- a/cmake/modules/FindLEX.cmake +++ b/cmake/modules/FindLEX.cmake @@ -36,9 +36,7 @@ MACRO(ADD_LEX_FILES _source _generated) ADD_CUSTOM_COMMAND( OUTPUT ${_outc} ${_outh} - COMMAND ${SH_EXECUTABLE} ${SH_FLAGS1} ${SH_FLAGS2} ${CMAKE_SOURCE_DIR}/tools/runlex.sh ${LEX_EXECUTABLE} - -o${_outc} - ${_in} + COMMAND ${LEX_EXECUTABLE} -o${_outc} --header-file=${_outh} ${_in} DEPENDS ${_in} ) LIST(APPEND ${_source} ${_in}) -- cgit v1.2.1