diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2009-06-15 18:59:33 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2009-06-15 18:59:33 +0000 |
| commit | d3fcd1a09b43032c7b78cecd8d74bc49f31b9539 (patch) | |
| tree | d02fef752a7e308a04d528308ff711448c8626c7 /cmake/modules | |
| parent | 0d300bb6f50a3c28adac30b1c09734975f2492cc (diff) | |
| download | wireshark-d3fcd1a09b43032c7b78cecd8d74bc49f31b9539.tar.gz | |
CMake now successfully builds dumpcap
svn path=/trunk/; revision=28745
Diffstat (limited to 'cmake/modules')
| -rw-r--r-- | cmake/modules/FindLEX.cmake | 9 | ||||
| -rw-r--r-- | cmake/modules/FindSED.cmake | 31 | ||||
| -rw-r--r-- | cmake/modules/FindYACC.cmake | 4 |
3 files changed, 37 insertions, 7 deletions
diff --git a/cmake/modules/FindLEX.cmake b/cmake/modules/FindLEX.cmake index 38dfeac5d4..cdaaf7f715 100644 --- a/cmake/modules/FindLEX.cmake +++ b/cmake/modules/FindLEX.cmake @@ -38,19 +38,18 @@ MACRO(ADD_LEX_FILES _sources ) GET_FILENAME_COMPONENT(_basename ${_current_FILE} NAME_WE) SET(_outc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.c) - SET(_outh ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) ADD_CUSTOM_COMMAND( - OUTPUT ${_outc} ${_outh} - COMMAND ${LEX_EXECUTABLE} + 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} ${_outh} ) + SET(${_sources} ${${_sources}} ${_outc} ) ENDFOREACH (_current_FILE) ENDMACRO(ADD_LEX_FILES) diff --git a/cmake/modules/FindSED.cmake b/cmake/modules/FindSED.cmake new file mode 100644 index 0000000000..fb79fd8c9e --- /dev/null +++ b/cmake/modules/FindSED.cmake @@ -0,0 +1,31 @@ +# - Find unix commands from cygwin +# This module looks for some usual Unix commands. +# + +INCLUDE(FindCygwin) + +FIND_PROGRAM(SED_EXECUTABLE + NAMES + sed + PATH + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin + /usr/local/bin + /sbin +) +MARK_AS_ADVANCED( + SED_EXECUTABLE +) + + +# search sed +MACRO(FIND_SED) + IF(NOT SED_EXECUTABLE) + FIND_PROGRAM(SED_EXECUTABLE sed) + IF (NOT SED_EXECUTABLE) + MESSAGE(FATAL_ERROR "sed not found - aborting") + ENDIF (NOT SED_EXECUTABLE) + ENDIF(NOT SED_EXECUTABLE) +ENDMACRO(FIND_SED) + diff --git a/cmake/modules/FindYACC.cmake b/cmake/modules/FindYACC.cmake index c12a4c8226..01dbe11615 100644 --- a/cmake/modules/FindYACC.cmake +++ b/cmake/modules/FindYACC.cmake @@ -20,12 +20,12 @@ MARK_AS_ADVANCED( ) -# search flex +# search bison/yacc MACRO(FIND_YACC) IF(NOT YACC_EXECUTABLE) FIND_PROGRAM(YACC_EXECUTABLE bison) IF (NOT YACC_EXECUTABLE) - MESSAGE(FATAL_ERROR "flex not found - aborting") + MESSAGE(FATAL_ERROR "bison/yacc not found - aborting") ENDIF (NOT YACC_EXECUTABLE) ENDIF(NOT YACC_EXECUTABLE) ENDMACRO(FIND_YACC) |