From 12d09ee24956403c43ddc29fe56bec8e4d20a3dc Mon Sep 17 00:00:00 2001 From: Paul Richards Date: Mon, 30 Mar 2015 22:02:50 +0100 Subject: [PATCH] Make flex detection on Windows more robust fixes #8913 Signed-off-by: Gunnar Beutner --- third-party/cmake/FindFLEX.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/third-party/cmake/FindFLEX.cmake b/third-party/cmake/FindFLEX.cmake index bc931d46a..7cd5c84f5 100644 --- a/third-party/cmake/FindFLEX.cmake +++ b/third-party/cmake/FindFLEX.cmake @@ -100,7 +100,7 @@ MARK_AS_ADVANCED(FL_LIBRARY) SET(FLEX_LIBRARIES ${FL_LIBRARY}) IF(FLEX_EXECUTABLE) - + GET_FILENAME_COMPONENT(FLEX_EXECUTABLE_NAME ${FLEX_EXECUTABLE} NAME) EXECUTE_PROCESS(COMMAND ${FLEX_EXECUTABLE} --version OUTPUT_VARIABLE FLEX_version_output ERROR_VARIABLE FLEX_version_error @@ -113,7 +113,7 @@ IF(FLEX_EXECUTABLE) MESSAGE("Command \"${FLEX_EXECUTABLE} --version\" failed with output:\n${FLEX_version_output}\n${FLEX_version_error}\nFLEX_VERSION will not be available") ENDIF() ELSE() - STRING(REGEX REPLACE "^flex[^ ]* (.*)$" "\\1" + STRING(REGEX REPLACE "^${FLEX_EXECUTABLE_NAME}[^ ]* (.*)$" "\\1" FLEX_VERSION "${FLEX_version_output}") ENDIF()