diff options
| author | David Cole <david.cole@kitware.com> | 2012-09-04 19:47:49 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-09-04 19:47:49 (GMT) |
| commit | d6643e9ae4fb2a3943246ce02a7b1de99dbc11e9 (patch) | |
| tree | 7d27cbeb91d0fb3e39c8b441676593048033611f /Modules | |
| parent | 1f2694f52ecfceaba004fbf336eded4a76e42091 (diff) | |
| parent | af06482d24799106dbf5a2cbd82d20d034df2b45 (diff) | |
| download | CMake-d6643e9ae4fb2a3943246ce02a7b1de99dbc11e9.zip CMake-d6643e9ae4fb2a3943246ce02a7b1de99dbc11e9.tar.gz CMake-d6643e9ae4fb2a3943246ce02a7b1de99dbc11e9.tar.bz2 | |
Merge topic 'flex-version-apple'
af06482 FindFLEX: fix version extraction on Apple
Diffstat (limited to 'Modules')
| -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() |