Try to add tpg, but it seems it doesn't build with autofoo either.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30151 f5534014-38df-0310-8fa8-9805f1628bb7
This commit is contained in:
jmayer 2009-09-25 18:09:42 +00:00
parent 33b36f78e6
commit 14afdc70fe
6 changed files with 195 additions and 2 deletions

View File

@ -257,6 +257,8 @@ foreach(PACKAGE ${PACKAGELIST})
endif()
endforeach()
find_package(YAPP)
if(HAVE_LIBPYTHON)
set(HAVE_PYTHON 1)
set(PYTHON_DIR "${CMAKE_INSTALL_PREFIX}/lib/wireshark/python/${VERSION}")
@ -315,7 +317,7 @@ if(ENABLE_PLUGINS)
plugins/asn1
plugins/docsis
plugins/ethercat
# plugins/giop
plugins/giop
plugins/gryphon
plugins/irda
plugins/m2m
@ -324,11 +326,17 @@ if(ENABLE_PLUGINS)
plugins/profinet
plugins/sercosiii
plugins/stats_tree
# plugins/tpg
plugins/unistim
plugins/wimax
plugins/wimaxasncp
)
# It seems this stuff doesn't build with autofoo either...
# if(YAPP_FOUND)
# set(PLUGIN_SRC_DIRS
# ${PLUGIN_SRC_DIRS}
# plugins/tpg
# )
# endif()
else()
set(PLUGIN_SRC_DIRS )
endif()

View File

@ -0,0 +1,25 @@
#
# $Id$
#
# - Find unix commands from cygwin
# This module looks for some usual Unix commands.
#
INCLUDE(FindCygwin)
FIND_PROGRAM(YAPP_EXECUTABLE
NAMES
yapp
PATHS
${CYGWIN_INSTALL_PATH}/bin
/bin
/usr/bin
/usr/local/bin
/sbin
)
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(YAPP DEFAULT_MSG YAPP_EXECUTABLE)
MARK_AS_ADVANCED(YAPP_EXECUTABLE)

View File

@ -1753,6 +1753,7 @@ AC_OUTPUT(
plugins/profinet/Makefile
plugins/sercosiii/Makefile
plugins/stats_tree/Makefile
plugins/tpg/Makefile
plugins/unistim/Makefile
plugins/wimax/Makefile
plugins/wimaxasncp/Makefile

View File

@ -35,6 +35,7 @@ SUBDIRS = $(_CUSTOM_SUBDIRS_) \
profinet \
sercosiii \
stats_tree \
tpg \
unistim \
wimax \
wimaxasncp

View File

@ -0,0 +1,84 @@
# CMakeLists.txt
#
# $Id$
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
set(COSNAMING_SRC
packet-cosnaming.c
)
set(COSEVENTCOMM_SRC
packet-coseventcomm.c
)
set(TANGO_SRC
packet-tango.c
)
set(PARLAY_SRC
packet-parlay.c
)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
# todo
# Do I need any of this or is this handled by type MODULE?
# asn1_la_LDFLAGS = -module -avoid-version
add_library(cosnaming MODULE
${COSNAMING_SRC}
)
install(TARGETS cosnaming
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}
)
add_library(coseventcomm MODULE
${COSEVENTCOMM_SRC}
)
install(TARGETS coseventcomm
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}
)
add_library(tango MODULE
${TANGO_SRC}
)
install(TARGETS tango
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}
)
add_library(parlay MODULE
${PARLAY_SRC}
)
install(TARGETS parlay
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}
)

View File

@ -0,0 +1,74 @@
# CMakeLists.txt
#
# $Id$
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
set(PLUGIN_FILES
http-parser.c
packet-http.c
)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
set(_tpg ${CMAKE_SOURCE_DIR}/tools/tpg)
ADD_CUSTOM_COMMAND(
OUTPUT
TPG.pm
COMMAND ${YAPP_EXECUTABLE}
-v
-m TPG
${_tpg}/tpg.yp
DEPENDS
${_tpg}/tpg.yp
)
ADD_CUSTOM_COMMAND(
OUTPUT
http-parser.h
http-parser.c
COMMAND ${PERL_EXECUTABLE}
-I${CMAKE_BINARY_DIR}
-I${_tpg}
${_tpg}/tpg.pl
${CMAKE_CURRENT_SOURCE_DIR}/http.tpg
DEPENDS
${_tpg}/tpg.pl
TPG.pm
${_tpg}/V2P.pm
${CMAKE_CURRENT_SOURCE_DIR}/http.tpg
)
# todo
# Do I need any of this or is this handled by type MODULE?
# asn1_la_LDFLAGS = -module -avoid-version
add_library(tpg MODULE
${PLUGIN_FILES}
)
install(TARGETS tpg
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}
)