osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Add register_dissector_files macro 

svn path=/trunk/; revision=30433
This commit is contained in:
Kovarththanan Rajaratnam 2009-10-09 16:24:22 +00:00
parent f99ca83a8c
commit f4880ee550
3 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -28,6 +28,7 @@ cmake_minimum_required(VERSION 2.6)
#Where to find local cmake scripts
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
INCLUDE(UseLemon)
INCLUDE(UseMakeDissectorReg)
# Under linux the release mode (CMAKE_BUILD_TYPE=release) defines NDEBUG

33
cmake/modules/UseMakeDissectorReg.cmake Normal file
View File

@ -0,0 +1,33 @@
#
# $Id$
#
MACRO(REGISTER_DISSECTOR_FILES _outputfile _registertype )
# FIXME: Only the Python stuff has been implemented
# Make this into a MACRO, to avoid duplication with plugins/.../
#register.c: $(plugin_src) $(ALL_DISSECTORS_SRC) $(top_srcdir)/tools/make-dissector-reg \
# $(top_srcdir)/tools/make-dissector-reg.py
# @if test -n "$(PYTHON)"; then \
# echo Making register.c with python ; \
# $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
# dissectors $(ALL_DISSECTORS_SRC) ; \
# else \
# echo Making register.c with shell script ; \
# $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
# dissectors $(plugin_src) $(ALL_DISSECTORS_SRC) ; \
# fi
set( _sources ${ARGN} )
ADD_CUSTOM_COMMAND(
OUTPUT
${_outputfile}
COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
${CMAKE_CURRENT_SOURCE_DIR}
${_registertype}
${_sources}
DEPENDS
${_sources}
${CMAKE_SOURCE_DIR}/tools/make-dissector-reg
${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
)
ENDMACRO(REGISTER_DISSECTOR_FILES)

31
epan/CMakeLists.txt
View File

@ -36,7 +36,6 @@ endif()
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/dfilter
${CMAKE_CURRENT_SOURCE_DIR}/dissectors
${CMAKE_CURRENT_SOURCE_DIR}/ftypes
@ -1027,33 +1026,11 @@ set_source_files_properties(
# FIXME: -Werror and -pedantic exclude each other: test for -pedantic
# COMPILE_FLAGS -Werror
)
ADD_CUSTOM_COMMAND(
# FIXME: Only the Python stuff has been implemented
# Make this into a MACRO, to avoid duplication with plugins/.../
#register.c: $(plugin_src) $(ALL_DISSECTORS_SRC) $(top_srcdir)/tools/make-dissector-reg \
# $(top_srcdir)/tools/make-dissector-reg.py
# @if test -n "$(PYTHON)"; then \
# echo Making register.c with python ; \
# $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
# dissectors $(ALL_DISSECTORS_SRC) ; \
# else \
# echo Making register.c with shell script ; \
# $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
# dissectors $(plugin_src) $(ALL_DISSECTORS_SRC) ; \
# fi
OUTPUT register.c
COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
${CMAKE_CURRENT_SOURCE_DIR}
dissectors
${DISSECTOR_FILES}
DEPENDS
${DISSECTOR_FILES}
${CMAKE_SOURCE_DIR}/tools/make-dissector-reg
${CMAKE_SOURCE_DIR}/tools/make-dissector-reg.py
)
register_dissector_files(register.c
dissectors
${DISSECTOR_FILES})
set(FTYPE_FILES
ftypes/ftypes.c
ftypes/ftype-bytes.c