diff options
| author | Rolf Eike Beer <eike@sf-mail.de> | 2012-01-20 17:44:00 +0100 |
|---|---|---|
| committer | Rolf Eike Beer <eike@sf-mail.de> | 2012-01-20 18:27:43 +0100 |
| commit | 2cf5df3e58842a3e0fdeb919414f32e53dbe0aec (patch) | |
| tree | 81187d6d2f7734d660af057835149f45258f1406 /Modules/FindFLEX.cmake | |
| parent | b8ff1c1e72899e7381d93e44b00824faf73d94ab (diff) | |
| download | cmake-2cf5df3e58842a3e0fdeb919414f32e53dbe0aec.tar.gz | |
FindFLEX: fix version parsing for old flex versions
Diffstat (limited to 'Modules/FindFLEX.cmake')
| -rw-r--r-- | Modules/FindFLEX.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake index 6a70b40302..6309bc9239 100644 --- a/Modules/FindFLEX.cmake +++ b/Modules/FindFLEX.cmake @@ -91,8 +91,12 @@ 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" + # older versions of flex printed "/full/path/to/executable version X.Y" + # newer versions use "basename(executable) X.Y" + GET_FILENAME_COMPONENT(FLEX_EXE_NAME "${FLEX_EXECUTABLE}" NAME) + STRING(REGEX REPLACE "^.*${FLEX_EXE_NAME} (version )?([0-9]+[^ ]*)$" "\\2" FLEX_VERSION "${FLEX_version_output}") + UNSET(FLEX_EXE_NAME) ENDIF() #============================================================ |