diff options
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | cmake/modules/FindYAPP.cmake | 25 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | plugins/Makefile.am | 1 | ||||
| -rw-r--r-- | plugins/giop/CMakeLists.txt | 84 | ||||
| -rw-r--r-- | plugins/tpg/CMakeLists.txt | 74 |
6 files changed, 195 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 81b89fbd7c..bbbc78a288 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/cmake/modules/FindYAPP.cmake b/cmake/modules/FindYAPP.cmake new file mode 100644 index 0000000000..3b38fa4c1a --- /dev/null +++ b/cmake/modules/FindYAPP.cmake @@ -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) + diff --git a/configure.in b/configure.in index c7c1f6c90a..a51e3a0b92 100644 --- a/configure.in +++ b/configure.in @@ -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 diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 4763c0a869..10d80eff96 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -35,6 +35,7 @@ SUBDIRS = $(_CUSTOM_SUBDIRS_) \ profinet \ sercosiii \ stats_tree \ + tpg \ unistim \ wimax \ wimaxasncp diff --git a/plugins/giop/CMakeLists.txt b/plugins/giop/CMakeLists.txt new file mode 100644 index 0000000000..591f935a6f --- /dev/null +++ b/plugins/giop/CMakeLists.txt @@ -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} +) + diff --git a/plugins/tpg/CMakeLists.txt b/plugins/tpg/CMakeLists.txt new file mode 100644 index 0000000000..c6106df8eb --- /dev/null +++ b/plugins/tpg/CMakeLists.txt @@ -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} +) + |