diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2009-05-29 10:57:47 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2009-05-29 10:57:47 +0000 |
| commit | 18887f7b72ee2e4c38774a511b774a5d6e098072 (patch) | |
| tree | 839fe8153e295c981b07293d73afe57fab7b80ef /cmake/modules/FindLEX.cmake | |
| parent | b4aeb97ed51b1f0d868c8a17ae1d50587a0418f1 (diff) | |
Resume work on CMake for Wireshark. Finally found and fixed a
few mistakes that I made earlier.
Current status: dumpcap still doesn't build
Next step: Add a ylwrap like workaround for flex misbehaviour.
svn path=/trunk/; revision=28518
Diffstat (limited to 'cmake/modules/FindLEX.cmake')
| -rw-r--r-- | cmake/modules/FindLEX.cmake | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/cmake/modules/FindLEX.cmake b/cmake/modules/FindLEX.cmake index 2e307f3605..38dfeac5d4 100644 --- a/cmake/modules/FindLEX.cmake +++ b/cmake/modules/FindLEX.cmake @@ -5,8 +5,8 @@ INCLUDE(FindCygwin) FIND_PROGRAM(LEX_EXECUTABLE NAMES - lex flex + lex PATH ${CYGWIN_INSTALL_PATH}/bin /bin @@ -18,38 +18,39 @@ MARK_AS_ADVANCED( LEX_EXECUTABLE ) ---------- -# flex a .ll file +# flex a .l file # search flex -MACRO(FIND_FLEX) - IF(NOT FLEX_EXECUTABLE) - FIND_PROGRAM(FLEX_EXECUTABLE flex) - IF (NOT FLEX_EXECUTABLE) +MACRO(FIND_LEX) + IF(NOT LEX_EXECUTABLE) + FIND_PROGRAM(LEX_EXECUTABLE flex) + IF (NOT LEX_EXECUTABLE) MESSAGE(FATAL_ERROR "flex not found - aborting") - ENDIF (NOT FLEX_EXECUTABLE) - ENDIF(NOT FLEX_EXECUTABLE) -ENDMACRO(FIND_FLEX) + ENDIF (NOT LEX_EXECUTABLE) + ENDIF(NOT LEX_EXECUTABLE) +ENDMACRO(FIND_LEX) -MACRO(ADD_FLEX_FILES _sources ) - FIND_FLEX() +MACRO(ADD_LEX_FILES _sources ) + FIND_LEX() FOREACH (_current_FILE ${ARGN}) GET_FILENAME_COMPONENT(_in ${_current_FILE} ABSOLUTE) GET_FILENAME_COMPONENT(_basename ${_current_FILE} NAME_WE) - SET(_out ${CMAKE_CURRENT_BINARY_DIR}/flex_${_basename}.cpp) + SET(_outc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.c) + SET(_outh ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) ADD_CUSTOM_COMMAND( - OUTPUT ${_out} - COMMAND ${FLEX_EXECUTABLE} + OUTPUT ${_outc} ${_outh} + COMMAND ${LEX_EXECUTABLE} ARGS - -o${_out} + -o${_outc} + --header-file=${_outh} ${_in} DEPENDS ${_in} ) - SET(${_sources} ${${_sources}} ${_out} ) + SET(${_sources} ${${_sources}} ${_outc} ${_outh} ) ENDFOREACH (_current_FILE) -ENDMACRO(ADD_FLEX_FILES) +ENDMACRO(ADD_LEX_FILES) |