diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-09-19 16:33:11 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2012-09-19 16:33:11 (GMT) |
| commit | 9d8e59db71833dce7133bac48e461e388223eb51 (patch) | |
| tree | ffe24aaf87035587dfb8b8f2d3c9edb0a7b1f42d /Modules/FindFLEX.cmake | |
| parent | ea12871241e1a943be75e7c987f71f54ec3f3908 (diff) | |
| parent | 6674583caa20244d90aa14a67d059e7228a9f169 (diff) | |
| download | CMake-9d8e59db71833dce7133bac48e461e388223eb51.zip CMake-9d8e59db71833dce7133bac48e461e388223eb51.tar.gz CMake-9d8e59db71833dce7133bac48e461e388223eb51.tar.bz2 | |
Merge branch 'use-generator-target' into AutomocUseTargetProperties
Diffstat (limited to 'Modules/FindFLEX.cmake')
| -rw-r--r-- | Modules/FindFLEX.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake index e397d28..daae94f 100644 --- a/Modules/FindFLEX.cmake +++ b/Modules/FindFLEX.cmake @@ -94,7 +94,7 @@ if(FLEX_EXECUTABLE) # 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" + string(REGEX REPLACE "^.*${FLEX_EXE_NAME}\"? (version )?([0-9]+[^ ]*)( .*)?$" "\\2" FLEX_VERSION "${FLEX_version_output}") unset(FLEX_EXE_NAME) endif() |