diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2009-06-16 04:12:30 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2009-06-16 04:12:30 +0000 |
| commit | 67d508edaf30cf632d53038f8133a4a65bc704a2 (patch) | |
| tree | a29af249c70aa894459ede218bebfe464b0045f1 /cmake/modules | |
| parent | fbb5b30ceb79ceaaaf39042a9fc18072b63242bc (diff) | |
OK, so my last commit message was too optimistic - I was using
an installed version of wsutil. dumpcap now really builds on
Linux via cmake.
svn path=/trunk/; revision=28754
Diffstat (limited to 'cmake/modules')
| -rw-r--r-- | cmake/modules/FindLEX.cmake | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/cmake/modules/FindLEX.cmake b/cmake/modules/FindLEX.cmake index cdaaf7f715..2f75df6edc 100644 --- a/cmake/modules/FindLEX.cmake +++ b/cmake/modules/FindLEX.cmake @@ -22,34 +22,36 @@ MARK_AS_ADVANCED( # search flex 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 LEX_EXECUTABLE) - ENDIF(NOT LEX_EXECUTABLE) + IF(NOT LEX_EXECUTABLE) + FIND_PROGRAM(LEX_EXECUTABLE flex) + IF (NOT LEX_EXECUTABLE) + MESSAGE(FATAL_ERROR "flex not found - aborting") + ENDIF (NOT LEX_EXECUTABLE) + ENDIF(NOT LEX_EXECUTABLE) ENDMACRO(FIND_LEX) MACRO(ADD_LEX_FILES _sources ) - FIND_LEX() + FIND_LEX() FOREACH (_current_FILE ${ARGN}) GET_FILENAME_COMPONENT(_in ${_current_FILE} ABSOLUTE) GET_FILENAME_COMPONENT(_basename ${_current_FILE} NAME_WE) SET(_outc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.c) + SET(_outh ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_lex.h) ADD_CUSTOM_COMMAND( - OUTPUT ${_outc} -# COMMAND ${LEX_EXECUTABLE} - COMMAND ${CMAKE_SOURCE_DIR}/tools/runlex.sh ${LEX_EXECUTABLE} - ARGS - -o${_outc} - ${_in} - DEPENDS ${_in} + OUTPUT ${_outc} +# COMMAND ${LEX_EXECUTABLE} + COMMAND ${CMAKE_SOURCE_DIR}/tools/runlex.sh ${LEX_EXECUTABLE} + ARGS + -o${_outc} + --header-file=${_outh} + ${_in} + DEPENDS ${_in} ) - SET(${_sources} ${${_sources}} ${_outc} ) - ENDFOREACH (_current_FILE) + SET(${_sources} ${${_sources}} ${_outc} ) + ENDFOREACH (_current_FILE) ENDMACRO(ADD_LEX_FILES) |