kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'winflexbison' 

df29336 FindFLEX: Add support for the Win flex-bison distribution
e593f8a FindBISON: Add support for the Win flex-bison distribution
This commit is contained in:
Brad King 2012-11-27 13:34:57 -05:00 committed by CMake Topic Stage
parent dcb3701d76 df29336893
commit d5adbbcf9c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/FindBISON.cmake
View File

@ -47,7 +47,7 @@
# (To distribute this file outside of CMake, substitute the full # (To distribute this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
find_program(BISON_EXECUTABLE bison DOC "path to the bison executable") find_program(BISON_EXECUTABLE NAMES bison win_bison DOC "path to the bison executable")
mark_as_advanced(BISON_EXECUTABLE) mark_as_advanced(BISON_EXECUTABLE)
if(BISON_EXECUTABLE) if(BISON_EXECUTABLE)

10
Modules/FindFLEX.cmake
View File

@ -63,7 +63,7 @@
# (To distribute this file outside of CMake, substitute the full # (To distribute this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
find_program(FLEX_EXECUTABLE flex DOC "path to the flex executable") find_program(FLEX_EXECUTABLE NAMES flex win_flex DOC "path to the flex executable")
mark_as_advanced(FLEX_EXECUTABLE) mark_as_advanced(FLEX_EXECUTABLE)
find_library(FL_LIBRARY NAMES fl find_library(FL_LIBRARY NAMES fl
@ -93,10 +93,12 @@ if(FLEX_EXECUTABLE)
else() else()
# older versions of flex printed "/full/path/to/executable version X.Y" # older versions of flex printed "/full/path/to/executable version X.Y"
# newer versions use "basename(executable) X.Y" # newer versions use "basename(executable) X.Y"
get_filename_component(FLEX_EXE_NAME "${FLEX_EXECUTABLE}" NAME) get_filename_component(FLEX_EXE_NAME_WE "${FLEX_EXECUTABLE}" NAME_WE)
string(REGEX REPLACE "^.*${FLEX_EXE_NAME}\"? (version )?([0-9]+[^ ]*)( .*)?$" "\\2" get_filename_component(FLEX_EXE_EXT "${FLEX_EXECUTABLE}" EXT)
string(REGEX REPLACE "^.*${FLEX_EXE_NAME_WE}(${FLEX_EXE_EXT})?\"? (version )?([0-9]+[^ ]*)( .*)?$" "\\3"
FLEX_VERSION "${FLEX_version_output}") FLEX_VERSION "${FLEX_version_output}")
unset(FLEX_EXE_NAME) unset(FLEX_EXE_EXT)
unset(FLEX_EXE_NAME_WE)
endif() endif()
#============================================================ #============================================================