diff options
author | Jörg Mayer <jmayer@loplof.de> | 2009-09-09 13:20:33 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2009-09-09 13:20:33 +0000 |
commit | ca6b1e2b2142c7727bca82540c14d2a9c41e1a05 (patch) | |
tree | 5f35b5d74741be36415415d8d68acdd479e5c606 | |
parent | a65f72e8f045ec9c17848c6508c9ccd27e2e91f4 (diff) |
CMAKE: Get most of of missing *build* pieces into place
svn path=/trunk/; revision=29819
-rw-r--r-- | CMakeLists.txt | 107 | ||||
-rw-r--r-- | cmake/modules/FindADNS.cmake | 97 | ||||
-rw-r--r-- | cmake/modules/FindCARES.cmake | 32 | ||||
-rw-r--r-- | cmake/modules/FindDBUS.cmake | 136 | ||||
-rw-r--r-- | cmake/modules/FindDBUSGLIB.cmake | 126 | ||||
-rw-r--r-- | cmake/modules/FindGCRYPT.cmake | 30 | ||||
-rw-r--r-- | cmake/modules/FindGNUTLS.cmake | 35 | ||||
-rw-r--r-- | cmake/modules/FindGTK2.cmake | 2 | ||||
-rw-r--r-- | cmake/modules/FindLUA.cmake | 60 | ||||
-rw-r--r-- | cmake/modules/FindMATH.cmake | 14 | ||||
-rw-r--r-- | cmake/modules/FindPCAP.cmake | 8 | ||||
-rw-r--r-- | cmake/modules/FindPCRE.cmake | 14 | ||||
-rw-r--r-- | cmake/modules/FindPORTAUDIO.cmake | 14 | ||||
-rw-r--r-- | cmake/modules/FindSMI.cmake | 32 | ||||
-rw-r--r-- | cmake/modules/FindWSWIN32.cmake | 6 | ||||
-rw-r--r-- | cmake/modules/FindZ.cmake | 32 | ||||
-rw-r--r-- | cmakeconfig.h.in | 9 | ||||
-rw-r--r-- | codecs/CMakeLists.txt | 32 | ||||
-rw-r--r-- | epan/CMakeLists.txt | 25 | ||||
-rw-r--r-- | epan/wslua/CMakeLists.txt | 107 |
20 files changed, 536 insertions, 382 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f65bc0407..e4268dc3e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,6 +47,8 @@ include_directories( ${CMAKE_SOURCE_DIR}/epan/dfilter ${CMAKE_SOURCE_DIR}/epan/dissectors ${CMAKE_SOURCE_DIR}/epan/ftypes + ${CMAKE_SOURCE_DIR}/epan/wslua + ${CMAKE_SOURCE_DIR}/epan/wspython ${CMAKE_SOURCE_DIR}/tools/lemon ${CMAKE_SOURCE_DIR}/wiretap ${CMAKE_SOURCE_DIR}/wsutil @@ -68,9 +70,28 @@ option(BUILD_editcap "Build editcap" ON) option(BUILD_capinfos "Build capinfos" ON) option(BUILD_randpkt "Build randpkt" ON) option(BUILD_dftest "Build dftest" ON) + + +option(ENABLE_EXTRA_GCC_CHECKS "Do additional -W checks in GCC" OFF) +option(ENABLE_AIRPCAP "Enable Airpcap support" ON) +# todo option(ENABLE_STATIC "Build a static version of Wireshark" OFF) + +option(ENABLE_CARES "Build with c_ares support" OFF) option(ENABLE_ADNS "Build with adns support" ON) -option(ENABLE_EXTRA_GCC_CHECKS "Do additional -W checks in GCC" OFF) +option(ENABLE_PCRE "Build with pcre support" ON) +option(ENABLE_PORTAUDIO "Build with portaudio support" ON) +option(ENABLE_Z "Build with zlib compression support" ON) +option(ENABLE_LUA "Build with lua dissector support" ON) +option(ENABLE_SMI "Build with smi snmp support" ON) +# todo +option(ENABLE_GNUTLS "Build with GNU TLS support" ON) +option(ENABLE_GCRYPT "Build with GNU crypto support" ON) +option(ENABLE_KRB5 "Build with MIT Kerberos 5 support" ON) +option(ENABLE_GEOIP "Build with GeoIP support" ON) +option(ENABLE_PYTHON "Build with python dissector support" ON) +option(ENABLE_CAP "Build with posix capabilities support" OFF) + if(ENABLE_EXTRA_GCC_CHECKS) set(WIRESHARK_EXTRA_GCC_FLAGS -Wcast-qual -Wcast-align -Wbad-function-cast @@ -101,16 +122,51 @@ if(BUILD_wireshark) set(PACKAGELIST GTK2 ${PACKAGELIST}) endif() +# SMI SNMP +if(ENABLE_SMI) + set(PACKAGELIST SMI ${PACKAGELIST}) +endif() + +# GNU crypto +if(ENABLE_GCRYPT) + set(PACKAGELIST GCRYPT ${PACKAGELIST}) +endif() + +# GNU SSL/TLS support +if(ENABLE_GNUTLS) + set(PACKAGELIST GNUTLS ${PACKAGELIST}) +endif() + # Regular expressions lib if(ENABLE_PCRE) set(PACKAGELIST PCRE ${PACKAGELIST}) endif() +# Portable audio +if(ENABLE_PORTAUDIO) + set(PACKAGELIST PORTAUDIO ${PACKAGELIST}) +endif() + +# C Asynchronouse resolver +if(ENABLE_CARES) + set(PACKAGELIST CARES ${PACKAGELIST}) +endif() + #Gnu asynchronous DNS if(ENABLE_ADNS) set(PACKAGELIST ADNS ${PACKAGELIST}) endif() +# Zlib compression +if(ENABLE_Z) + set(PACKAGELIST Z ${PACKAGELIST}) +endif() + +# Lua 5.1 dissectors +if(ENABLE_LUA) + set(PACKAGELIST LUA ${PACKAGELIST}) +endif() + set(PROGLIST text2pcap mergecap capinfos editcap dumpcap) #Let's loop the package list @@ -120,15 +176,24 @@ foreach(PACKAGE ${PACKAGELIST}) if (${PACKAGE}_FOUND) set(HAVE_LIB${PACKAGE} "1") include_directories(${${PACKAGE}_INCLUDE_DIRS}) - message(STATUS "${PACKAGE} include ${${PACKAGE}_INCLUDE_DIRS}") - message(STATUS "${PACKAGE} lib ${${PACKAGE}_LIBRARIES}") + message(STATUS "${PACKAGE} includes: ${${PACKAGE}_INCLUDE_DIRS}") + message(STATUS "${PACKAGE} libs: ${${PACKAGE}_LIBRARIES}") endif() endforeach() -# Hack for now: compat with current configure stuff -if(HAVE_LIBADNS) + +if(HAVE_LIBLUA) + set(HAVE_LUA_H 1) + set(HAVE_LUA_5_1 1) +endif() +if(HAVE_LIBCARES) + set(HAVE_C_ARES 1) +elseif(HAVE_LIBADNS) set(HAVE_GNU_ADNS 1) endif() +if(ENABLE_AIRPCAP) + set(HAVE_AIRPCAP 1) +endif() #packaging set(CPACK_PACKAGE_NAME wireshark) @@ -177,21 +242,20 @@ endif() add_subdirectory( epan ) add_subdirectory( gtk ) +add_subdirectory( codecs ) add_subdirectory( wiretap ) add_subdirectory( wsutil ) configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h) link_directories( + gtk + codecs epan wiretap wsutil ) -if(BUILD_wireshark) - link_directories( gtk ) -endif() - ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h COMMAND ${PERL} ${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl @@ -310,21 +374,22 @@ set(LIBEPAN_LIBS ${PCAP_LIBRARIES} # @SOCKET_LIBS@ # @NSL_LIBS@ -# @C_ARES_LIBS@ + ${CARES_LIBRARIES} ${ADNS_LIBRARIES} # @KRB5_LIBS@ # @FRAMEWORKS@ -# @LIBGCRYPT_LIBS@ -# @LIBGNUTLS_LIBS@ -# @LIBSMI_LDFLAGS@ + ${LUA_LIBRARIES} + ${GCRYPT_LIBRARIES} + ${GNUTLS_LIBRARIES} + ${SMI_LIBRARIES} + ${Z_LIBRARIES} ) if(BUILD_wireshark) -# todo set(wireshark_LIBS ui ${GTK2_LIBRARIES} -# codecs/libcodec.a + codecs ${PORTAUDIO_LIBRARIES} ${LIBEPAN_LIBS} ) @@ -404,8 +469,9 @@ if(BUILD_randpkt) ${PCAP_LIBRARIES} # @SOCKET_LIBS@ # @NSL_LIBS@ -# @C_ARES_LIBS@ + ${CARES_LIBRARIES} ${ADNS_LIBRARIES} + ${Z_LIBRARIES} ) set(randpkt_FILES randpkt.c @@ -421,6 +487,7 @@ if(BUILD_text2pcap) wsutil ${GLIB2_LIBRARIES} ${MATH_LIBRARIES} + ${Z_LIBRARIES} ) set(text2pcap_FILES text2pcap.c @@ -438,6 +505,7 @@ if(BUILD_mergecap) wiretap wsutil ${GLIB2_LIBRARIES} + ${Z_LIBRARIES} ) set(mergecap_FILES mergecap.c @@ -454,6 +522,7 @@ if(BUILD_capinfos) wiretap wsutil ${GLIB2_LIBRARIES} + ${Z_LIBRARIES} ) set(capinfos_FILES capinfos.c @@ -468,6 +537,7 @@ if(BUILD_editcap) wiretap wsutil ${GLIB2_LIBRARIES} + ${Z_LIBRARIES} ) set(editcap_FILES editcap.c @@ -489,9 +559,10 @@ if(BUILD_dumpcap) # @SOCKET_LIBS@ # @NSL_LIBS@ # @FRAMEWORKS@ -# @LIBGCRYPT_LIBS@ -# @LIBGNUTLS_LIBS@ + ${GCRYPT_LIBRARIES} + ${GNUTLS_LIBRARIES} # @LIBCAP_LIBS@ + ${Z_LIBRARIES} ) set(dumpcap_FILES diff --git a/cmake/modules/FindADNS.cmake b/cmake/modules/FindADNS.cmake index bc15636ffa..c7df80f0eb 100644 --- a/cmake/modules/FindADNS.cmake +++ b/cmake/modules/FindADNS.cmake @@ -1,85 +1,32 @@ -################################################################### -# -# Copyright (c) 2006 Frederic Heem, <frederic.heem@telsey.it> -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# -# * Neither the name of the Telsey nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -################################################################### # - Find adns -# Find the gnu adns includes and library -# http://www.chiark.greenend.org.uk/~ian/adns/ +# Find the native ADNS includes and library # # ADNS_INCLUDE_DIRS - where to find adns.h, etc. -# ADNS_LIBRARIES - List of libraries when using adns. -# ADNS_FOUND - True if adns found. - -#Includes -FIND_PATH(ADNS_INCLUDE_DIR - NAMES - adns.h - PATHS - /usr/local/include - /usr/include -) +# ADNS_LIBRARIES - List of libraries when using adns. +# ADNS_FOUND - True if adns found. -SET(ADNS_INCLUDE_DIRS ${ADNS_INCLUDE_DIR}) -#Library -FIND_LIBRARY(ADNS_LIBRARY - NAMES - adns - PATHS - /usr/lib - /usr/local/lib -) +IF (ADNS_INCLUDE_DIRS) + # Already in cache, be silent + SET(ADNS_FIND_QUIETLY TRUE) +ENDIF (ADNS_INCLUDE_DIRS) -SET(ADNS_LIBRARIES ${ADNS_LIBRARY}) +FIND_PATH(ADNS_INCLUDE_DIR adns.h) -#Is adns found ? -IF(ADNS_INCLUDE_DIR AND ADNS_LIBRARY) - SET( ADNS_FOUND "YES" ) -ENDIF(ADNS_INCLUDE_DIR AND ADNS_LIBRARY) +SET(ADNS_NAMES adns) +FIND_LIBRARY(ADNS_LIBRARY NAMES ${ADNS_NAMES} ) +# handle the QUIETLY and REQUIRED arguments and set ADNS_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(ADNS DEFAULT_MSG ADNS_LIBRARY ADNS_INCLUDE_DIR) -if (ADNS_FOUND) - if (NOT ADNS_FIND_QUIETLY) - message(STATUS "Found ADNS: ${ADNS_LIBRARIES}") - endif (NOT ADNS_FIND_QUIETLY) -else (ADNS_FOUND) - if (ADNS_FIND_REQUIRED) - message(FATAL_ERROR "Could not find ADNS") - endif (ADNS_FIND_REQUIRED) -endif (ADNS_FOUND) +IF(ADNS_FOUND) + SET( ADNS_LIBRARIES ${ADNS_LIBRARY} ) + SET( ADNS_INCLUDE_DIRS ${ADNS_INCLUDE_DIR} ) +ELSE(ADNS_FOUND) + SET( ADNS_LIBRARIES ) + SET( ADNS_INCLUDE_DIRS ) +ENDIF(ADNS_FOUND) -MARK_AS_ADVANCED( - ADNS_LIBRARIES - ADNS_INCLUDE_DIRS -) +MARK_AS_ADVANCED( ADNS_LIBRARIES ADNS_INCLUDE_DIRS ) diff --git a/cmake/modules/FindCARES.cmake b/cmake/modules/FindCARES.cmake new file mode 100644 index 0000000000..6c046bec14 --- /dev/null +++ b/cmake/modules/FindCARES.cmake @@ -0,0 +1,32 @@ +# - Find cares +# Find the native CARES includes and library +# +# CARES_INCLUDE_DIRS - where to find cares.h, etc. +# CARES_LIBRARIES - List of libraries when using cares. +# CARES_FOUND - True if cares found. + + +IF (CARES_INCLUDE_DIRS) + # Already in cache, be silent + SET(CARES_FIND_QUIETLY TRUE) +ENDIF (CARES_INCLUDE_DIRS) + +FIND_PATH(CARES_INCLUDE_DIR cares.h) + +SET(CARES_NAMES cares) +FIND_LIBRARY(CARES_LIBRARY NAMES ${CARES_NAMES} ) + +# handle the QUIETLY and REQUIRED arguments and set CARES_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(CARES DEFAULT_MSG CARES_LIBRARY CARES_INCLUDE_DIR) + +IF(CARES_FOUND) + SET( CARES_LIBRARIES ${CARES_LIBRARY} ) + SET( CARES_INCLUDE_DIRS ${CARES_INCLUDE_DIR} ) +ELSE(CARES_FOUND) + SET( CARES_LIBRARIES ) + SET( CARES_INCLUDE_DIRS ) +ENDIF(CARES_FOUND) + +MARK_AS_ADVANCED( CARES_LIBRARIES CARES_INCLUDE_DIRS ) diff --git a/cmake/modules/FindDBUS.cmake b/cmake/modules/FindDBUS.cmake deleted file mode 100644 index cc8d1894aa..0000000000 --- a/cmake/modules/FindDBUS.cmake +++ /dev/null @@ -1,136 +0,0 @@ -################################################################### -# -# Copyright (c) 2006 Frederic Heem, <frederic.heem@telsey.it> -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# -# * Neither the name of the Telsey nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -################################################################### -# - Locate D-Bus include paths and libraries. -# D-Bus can be found at http://www.freedesktop.org/wiki/Software/dbus. -# Written by Frederic Heem, frederic.heem _at_ telsey.it -# -# This module defines: -# DBUS_FOUND, true if D-Bus has been found -# DBUS_VERSION, the D-Bus version -# DBUS_INCLUDE_DIRS, where to find ptlib.h, etc. -# DBUS_LIBRARIES, library to link againt D-Bus -# DBUS_DEFINITIONS, the definitions used to compile D-Bus - -INCLUDE(UsePkgConfig) - -#Keep space in of $ENV{PKG_CONFIG_PATH} is empty -SET(PKG_CONFIG_PATH " $ENV{PKG_CONFIG_PATH}") - - -#Find the D-Bus package -PKGCONFIG_FOUND(dbus-1 ${PKG_CONFIG_PATH} DBUS_FOUND) - -IF(DBUS_FOUND) - MESSAGE(STATUS "D-Bus found") -ELSE(DBUS_FOUND) - MESSAGE(FATAL "D-Bus cannot be found") -ENDIF(DBUS_FOUND) - -#Include - -PKGCONFIG_INCLUDE_DIRS(dbus-1 ${PKG_CONFIG_PATH} DBUS_INCLUDE_DIRS_PKGCONFIG) - -MESSAGE(STATUS ${DBUS_INCLUDE_DIRS_PKGCONFIG}) - -FIND_PATH(DBUS_INCLUDE_DIR dbus/dbus.h - PATHS - ${DBUS_INCLUDE_DIRS_PKGCONFIG} - /usr/include/dbus-1.0 - DOC - "Path to dbus include file dbus/dbus.h" - NO_DEFAULT_PATH -) - -IF(DBUS_INCLUDE_DIR) - MESSAGE(STATUS "D-Bus include dir set to ${DBUS_INCLUDE_DIR}") -ELSE(DBUS_INCLUDE_DIR) - MESSAGE(FATAL "D-Bus include dirs cannot be found") -ENDIF(DBUS_INCLUDE_DIR) - -FIND_PATH(DBUS_INCLUDE_DIR_ARCH dbus/dbus-arch-deps.h - PATHS - ${DBUS_INCLUDE_DIRS_PKGCONFIG} - /usr/lib/dbus-1.0/include - DOC - "Path to dbus include file dbus/dbus-arch-deps.h" - NO_DEFAULT_PATH -) - -IF(DBUS_INCLUDE_DIR_ARCH) - MESSAGE(STATUS "D-Bus architecture include dir set to ${DBUS_INCLUDE_DIR_ARCH}") -ELSE(DBUS_INCLUDE_DIR_ARCH) - MESSAGE(FATAL " D-Bus architecture include dirs cannot be found") -ENDIF(DBUS_INCLUDE_DIR_ARCH) - -SET(DBUS_INCLUDE_DIRS ${DBUS_INCLUDE_DIR} ${DBUS_INCLUDE_DIR_ARCH}) - -#Library -PKGCONFIG_LIBRARY_DIR(dbus-1 ${PKG_CONFIG_PATH} DBUS_LIBRARY_DIR) - -SET(DBUS_LIB_PATH_DESCRIPTION "The directory containing the dbus library. E.g /home/fred/dbus/lib or c:\\dbus\\lib") - -FIND_LIBRARY(DBUS_LIBRARY - NAMES - dbus-1 - PATHS - ${DBUS_LIBRARY_DIR} - DOC - ${DBUS_LIB_PATH_DESCRIPTION} - NO_DEFAULT_PATH -) - -SET(DBUS_LIBRARIES ${DBUS_LIBRARY}) - -IF(DBUS_LIBRARIES) - MESSAGE(STATUS "D-Bus library set to ${DBUS_LIBRARIES}") -ELSE(DBUS_LIBRARIES) - MESSAGE(FATAL "D-Bus library cannot be found") -ENDIF(DBUS_LIBRARIES) - -#Version -PKGCONFIG_VERSION(dbus-1 ${PKG_CONFIG_PATH} DBUS_VERSION) -MESSAGE(STATUS "D-Bus version is ${DBUS_VERSION}") - -#Definition -PKGCONFIG_DEFINITION(dbus-1 ${PKG_CONFIG_PATH} DBUS_DEFINITIONS) -MESSAGE(STATUS "D-Bus definitions are ${DBUS_DEFINITIONS}") - - -MARK_AS_ADVANCED( - DBUS_INCLUDE_DIR - DBUS_INCLUDE_DIR_ARCH - DBUS_LIBRARY -) diff --git a/cmake/modules/FindDBUSGLIB.cmake b/cmake/modules/FindDBUSGLIB.cmake deleted file mode 100644 index 251bd291bc..0000000000 --- a/cmake/modules/FindDBUSGLIB.cmake +++ /dev/null @@ -1,126 +0,0 @@ -################################################################### -# -# Copyright (c) 2006 Frederic Heem, <frederic.heem@telsey.it> -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# -# * Neither the name of the Telsey nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -################################################################### -# - Locate dbus-glib-1 include paths and libraries -# dbus-glib-1 can be found at http://www.freedesktop.org/wiki/Software/dbus -# Written by Frederic Heem, frederic.heem _at_ telsey.it - -# This module defines -# DBUSGLIB_FOUND, true if dbus-glib-1 has been found -# DBUSGLIB_VERSION, the dbus-glib-1 version -# DBUSGLIB_INCLUDE_DIRS, where to find dbus/dbus-glib.h, etc. -# DBUSGLIB_LIBRARIES, library to link againt libdbus-glib-1 -# DBUSGLIB_DEFINITIONS, the definitions used to compile dbus-glib-1 -# DBUSGLIB_BINDING_TOOL_EXECUTABLE the glib dbus binding tool - -#D-Bus is required by dbus-glib-1 -FIND_PACKAGE(DBUS REQUIRED) - -#Keep space in case of $ENV{PKG_CONFIG_PATH} is empty -SET(PKG_CONFIG_PATH " $ENV{PKG_CONFIG_PATH}") - -#Find the D-Bus package -PKGCONFIG_FOUND(dbus-glib-1 ${PKG_CONFIG_PATH} DBUSGLIB_FOUND) - -IF(DBUSGLIB_FOUND) - MESSAGE(STATUS "D-Bus glib found") -ELSE(DBUSGLIB_FOUND) - MESSAGE(FATAL "D-Bus glib cannot be found") -ENDIF(DBUSGLIB_FOUND) - -#Includes -PKGCONFIG_INCLUDE_DIRS(dbus-glib-1 ${PKG_CONFIG_PATH} DBUSGLIB_INCLUDE_DIRS_PKGCONFIG) - -#TODO -FIND_PATH(DBUSGLIB_INCLUDE_DIR dbus/dbus-glib.h - PATHS - ${DBUSGLIB_INCLUDE_DIRS_PKGCONFIG} - /usr/include/dbus-1.0 - DOC - "Path to dbus glib include file dbus-glib.h" - NO_DEFAULT_PATH -) - -SET(DBUSGLIB_INCLUDE_DIRS ${DBUSGLIB_INCLUDE_DIR} ${DBUS_INCLUDE_DIRS}) - -IF(DBUSGLIB_INCLUDE_DIR) - MESSAGE(STATUS "D-Bus glib include dir set to ${DBUSGLIB_INCLUDE_DIR}") -ELSE(DBUSGLIB_INCLUDE_DIR) - MESSAGE(FATAL "D-Bus glib include dir cannot be found") -ENDIF(DBUSGLIB_INCLUDE_DIR) - -#Library -PKGCONFIG_LIBRARY_DIR(dbus-glib-1 ${PKG_CONFIG_PATH} DBUSGLIB_LIBRARY_DIR) - -SET(DBUSGLIB_LIB_PATH_DESCRIPTION "The directory containing the dbus glib library. E.g /home/fred/dbus-glib/lib or c:\\dbus-glib\\lib") - -FIND_LIBRARY(DBUSGLIB_LIBRARY - NAMES - dbus-glib-1 - PATHS - ${DBUSGLIB_LIBRARY_DIR} - DOC - ${DBUSGLIB_LIB_PATH_DESCRIPTION} -#NO_DEFAULT_PATH TODO fix PKGCONFIG_LIBRARY_DIR when pkg-config returns multiple directories -) - -SET(DBUSGLIB_LIBRARIES ${DBUSGLIB_LIBRARY} ${DBUS_LIBRARIES}) - -IF(DBUSGLIB_LIBRARIES) - MESSAGE(STATUS "D-Bus glib library set to ${DBUSGLIB_LIBRARIES}") -ELSE(DBUSGLIB_LIBRARIES) - MESSAGE(FATAL "D-Bus glib library cannot be found") -ENDIF(DBUSGLIB_LIBRARIES) - -#Version -PKGCONFIG_VERSION(dbus-glib-1 ${PKG_CONFIG_PATH} DBUSGLIB_VERSION) -MESSAGE(STATUS "D-Bus glib version is ${DBUSGLIB_VERSION}") - -#Definition -PKGCONFIG_DEFINITION(dbus-glib-1 ${PKG_CONFIG_PATH} DBUSGLIB_DEFINITIONS) -MESSAGE(STATUS "D-Bus glib definitions are ${DBUSGLIB_DEFINITIONS}") - -#binding tool -FIND_PROGRAM(DBUSGLIB_BINDING_TOOL_EXECUTABLE - NAMES - dbus-binding-tool - /usr/local/bin -) - -MARK_AS_ADVANCED( - DBUSGLIB_INCLUDE_DIR - DBUSGLIB_LIBRARY - DBUSGLIB_BINDING_TOOL_EXECUTABLE -) diff --git a/cmake/modules/FindGCRYPT.cmake b/cmake/modules/FindGCRYPT.cmake new file mode 100644 index 0000000000..3b8cb244e4 --- /dev/null +++ b/cmake/modules/FindGCRYPT.cmake @@ -0,0 +1,30 @@ +# - Find gcrypt +# Find the native GCRYPT includes and library +# +# GCRYPT_INCLUDE_DIRS - where to find gcrypt.h, etc. +# GCRYPT_LIBRARIES - List of libraries when using gcrypt. +# GCRYPT_FOUND - True if gcrypt found. + + +IF (GCRYPT_INCLUDE_DIRS) + # Already in cache, be silent + SET(GCRYPT_FIND_QUIETLY TRUE) +ENDIF (GCRYPT_INCLUDE_DIRS) + +FIND_PATH(GCRYPT_INCLUDE_DIR gcrypt.h) + +SET(GCRYPT_NAMES gcrypt) +FIND_LIBRARY(GCRYPT_LIBRARY NAMES ${GCRYPT_NAMES} ) + +# handle the QUIETLY and REQUIRED arguments and set GCRYPT_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GCRYPT DEFAULT_MSG GCRYPT_LIBRARY GCRYPT_INCLUDE_DIR) + +IF(GCRYPT_FOUND) + SET( GCRYPT_LIBRARIES ${GCRYPT_LIBRARY} ) +ELSE(GCRYPT_FOUND) + SET( GCRYPT_LIBRARIES ) +ENDIF(GCRYPT_FOUND) + +MARK_AS_ADVANCED( GCRYPT_LIBRARIES GCRYPT_INCLUDE_DIRS ) diff --git a/cmake/modules/FindGNUTLS.cmake b/cmake/modules/FindGNUTLS.cmake new file mode 100644 index 0000000000..37558aaf2b --- /dev/null +++ b/cmake/modules/FindGNUTLS.cmake @@ -0,0 +1,35 @@ +# - Find gnutls +# Find the native GNUTLS includes and library +# +# GNUTLS_INCLUDE_DIRS - where to find gnutls.h, etc. +# GNUTLS_LIBRARIES - List of libraries when using gnutls. +# GNUTLS_FOUND - True if gnutls found. + + +IF (GNUTLS_INCLUDE_DIRS) + # Already in cache, be silent + SET(GNUTLS_FIND_QUIETLY TRUE) +ENDIF (GNUTLS_INCLUDE_DIRS) + +FIND_PATH(GNUTLS_INCLUDE_DIR + NAMES + gnutls.h + gnutls/gnutls.h +# PATHS +) + +SET(GNUTLS_NAMES gnutls) +FIND_LIBRARY(GNUTLS_LIBRARY NAMES ${GNUTLS_NAMES} ) + +# handle the QUIETLY and REQUIRED arguments and set GNUTLS_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNUTLS DEFAULT_MSG GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR) + +IF(GNUTLS_FOUND) + SET( GNUTLS_LIBRARIES ${GNUTLS_LIBRARY} ) +ELSE(GNUTLS_FOUND) + SET( GNUTLS_LIBRARIES ) +ENDIF(GNUTLS_FOUND) + +MARK_AS_ADVANCED( GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIRS ) diff --git a/cmake/modules/FindGTK2.cmake b/cmake/modules/FindGTK2.cmake index 1730ee66bb..82ffafe46a 100644 --- a/cmake/modules/FindGTK2.cmake +++ b/cmake/modules/FindGTK2.cmake @@ -390,6 +390,8 @@ ELSE (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS) GTK2_GDKCONFIG_INCLUDE_PATH #GTK2_GOBJECT_LIBRARY GTK2_PANGO_INCLUDE_PATH + GTK2_INCLUDE_DIRS + GTK2_LIBRARIES ) ENDIF(UNIX) ENDIF (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS) diff --git a/cmake/modules/FindLUA.cmake b/cmake/modules/FindLUA.cmake new file mode 100644 index 0000000000..55e47a864d --- /dev/null +++ b/cmake/modules/FindLUA.cmake @@ -0,0 +1,60 @@ +# Locate Lua library +# This module defines +# LUA_FOUND, if false, do not try to link to Lua +# LUA_LIBRARIES +# LUA_INCLUDE_DIRS, where to find lua.h +# +# Note that the expected include convention is +# #include "lua.h" +# and not +# #include <lua/lua.h> +# This is because, the lua location is not standardized and may exist +# in locations other than lua/ + + +FIND_PATH(LUA_INCLUDE_DIR lua.h + HINTS + $ENV{LUA_DIR} + PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include + PATHS + ~/Library/Frameworks + /Library/Frameworks + /usr/local + /usr + /sw # Fink + /opt/local # DarwinPorts + /opt/csw # Blastwave + /opt +) + +FIND_LIBRARY(LUA_LIBRARY + NAMES lua51 lua5.1 lua + HINTS + $ENV{LUA_DIR} + PATH_SUFFIXES lib64 lib + PATHS + ~/Library/Frameworks + /Library/Frameworks + /usr/local + /usr + /sw + /opt/local + /opt/csw + /opt +) + +INCLUDE(FindPackageHandleStandardArgs) +# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if +# all listed variables are TRUE +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LUA DEFAULT_MSG LUA_LIBRARY LUA_INCLUDE_DIR) + +IF(LUA_LIBRARY) + SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries") + SET( LUA_INCLUDE_DIRS ${LUA_INCLUDE_DIR} ) +ELSE(LUA_LIBRARY) + SET( LUA_LIBRARIES ) + SET( LUA_INCLUDE_DIRS ) +ENDIF(LUA_LIBRARY) + +MARK_AS_ADVANCED(LUA_INCLUDE_DIRS LUA_LIBRARIES) + diff --git a/cmake/modules/FindMATH.cmake b/cmake/modules/FindMATH.cmake index 74175c34b3..9a6dd07149 100644 --- a/cmake/modules/FindMATH.cmake +++ b/cmake/modules/FindMATH.cmake @@ -1,15 +1,15 @@ # - Find math # Find the native MATH includes and library # -# MATH_INCLUDE_DIR - where to find math.h, etc. -# MATH_LIBRARIES - List of libraries when using math. -# MATH_FOUND - True if math found. +# MATH_INCLUDE_DIRS - where to find math.h, etc. +# MATH_LIBRARIES - List of libraries when using math. +# MATH_FOUND - True if math found. -IF (MATH_INCLUDE_DIR) +IF (MATH_INCLUDE_DIRS) # Already in cache, be silent SET(MATH_FIND_QUIETLY TRUE) -ENDIF (MATH_INCLUDE_DIR) +ENDIF (MATH_INCLUDE_DIRS) FIND_PATH(MATH_INCLUDE_DIR math.h) @@ -23,8 +23,10 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(MATH DEFAULT_MSG MATH_LIBRARY MATH_INCLUDE_DIR IF(MATH_FOUND) SET( MATH_LIBRARIES ${MATH_LIBRARY} ) + SET( MATH_INCLUDE_DIRS ${MATH_INCLUDE_DIR} ) ELSE(MATH_FOUND) SET( MATH_LIBRARIES ) + SET( MATH_INCLUDE_DIRS ) ENDIF(MATH_FOUND) -MARK_AS_ADVANCED( MATH_LIBRARY MATH_INCLUDE_DIR ) +MARK_AS_ADVANCED( MATH_LIBRARIES MATH_INCLUDE_DIRS ) diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake index d95baf4eb4..b082a05f0d 100644 --- a/cmake/modules/FindPCAP.cmake +++ b/cmake/modules/FindPCAP.cmake @@ -110,12 +110,12 @@ CHECK_FUNCTION_EXISTS("pcap_set_datalink" HAVE_PCAP_SET_DATALINK) #Is pcap found ? -IF(PCAP_INCLUDE_DIR AND PCAP_LIBRARY) +IF(PCAP_INCLUDE_DIRS AND PCAP_LIBRARIES) SET( PCAP_FOUND "YES" ) -ENDIF(PCAP_INCLUDE_DIR AND PCAP_LIBRARY) +ENDIF(PCAP_INCLUDE_DIRS AND PCAP_LIBRARIES) MARK_AS_ADVANCED( - PCAP_LIBRARY - PCAP_INCLUDE_DIR + PCAP_LIBRARIES + PCAP_INCLUDE_DIRS ) diff --git a/cmake/modules/FindPCRE.cmake b/cmake/modules/FindPCRE.cmake index 73d6d00bdd..120adb421b 100644 --- a/cmake/modules/FindPCRE.cmake +++ b/cmake/modules/FindPCRE.cmake @@ -1,15 +1,15 @@ # - Find pcre # Find the native PCRE includes and library # -# PCRE_INCLUDE_DIR - where to find pcre.h, etc. -# PCRE_LIBRARIES - List of libraries when using pcre. -# PCRE_FOUND - True if pcre found. +# PCRE_INCLUDE_DIRS - where to find pcre.h, etc. +# PCRE_LIBRARIES - List of libraries when using pcre. +# PCRE_FOUND - True if pcre found. -IF (PCRE_INCLUDE_DIR) +IF (PCRE_INCLUDE_DIRS) # Already in cache, be silent SET(PCRE_FIND_QUIETLY TRUE) -ENDIF (PCRE_INCLUDE_DIR) +ENDIF (PCRE_INCLUDE_DIRS) FIND_PATH(PCRE_INCLUDE_DIR pcre.h) @@ -23,8 +23,10 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG PCRE_LIBRARY PCRE_INCLUDE_DIR IF(PCRE_FOUND) SET( PCRE_LIBRARIES ${PCRE_LIBRARY} ) + SET( PCRE_INCLUDE_DIRS ${PCRE_INCLUDE_DIR} ) ELSE(PCRE_FOUND) SET( PCRE_LIBRARIES ) + SET( PCRE_INCLUDE_DIRS ) ENDIF(PCRE_FOUND) -MARK_AS_ADVANCED( PCRE_LIBRARY PCRE_INCLUDE_DIR ) +MARK_AS_ADVANCED( PCRE_LIBRARIES PCRE_INCLUDE_DIRS ) diff --git a/cmake/modules/FindPORTAUDIO.cmake b/cmake/modules/FindPORTAUDIO.cmake index 18a4fff19b..f7f098c65e 100644 --- a/cmake/modules/FindPORTAUDIO.cmake +++ b/cmake/modules/FindPORTAUDIO.cmake @@ -1,15 +1,15 @@ # - Find portaudio # Find the native PORTAUDIO includes and library # -# PORTAUDIO_INCLUDE_DIR - where to find portaudio.h, etc. -# PORTAUDIO_LIBRARIES - List of libraries when using portaudio. -# PORTAUDIO_FOUND - True if portaudio found. +# PORTAUDIO_INCLUDE_DIRS - where to find portaudio.h, etc. +# PORTAUDIO_LIBRARIES - List of libraries when using portaudio. +# PORTAUDIO_FOUND - True if portaudio found. -IF (PORTAUDIO_INCLUDE_DIR) +IF (PORTAUDIO_INCLUDE_DIRS) # Already in cache, be silent SET(PORTAUDIO_FIND_QUIETLY TRUE) -ENDIF (PORTAUDIO_INCLUDE_DIR) +ENDIF (PORTAUDIO_INCLUDE_DIRS) FIND_PATH(PORTAUDIO_INCLUDE_DIR portaudio.h) @@ -23,8 +23,10 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(PORTAUDIO DEFAULT_MSG PORTAUDIO_LIBRARY PORTAU IF(PORTAUDIO_FOUND) SET( PORTAUDIO_LIBRARIES ${PORTAUDIO_LIBRARY} ) + SET( PORTAUDIO_INCLUDE_DIRS ${PORTAUDIO_INCLUDE_DIR} ) ELSE(PORTAUDIO_FOUND) SET( PORTAUDIO_LIBRARIES ) + SET( PORTAUDIO_INCLUDE_DIRS ) ENDIF(PORTAUDIO_FOUND) -MARK_AS_ADVANCED( PORTAUDIO_LIBRARY PORTAUDIO_INCLUDE_DIR ) +MARK_AS_ADVANCED( PORTAUDIO_LIBRARIES PORTAUDIO_INCLUDE_DIRS ) diff --git a/cmake/modules/FindSMI.cmake b/cmake/modules/FindSMI.cmake new file mode 100644 index 0000000000..b9cafcbf46 --- /dev/null +++ b/cmake/modules/FindSMI.cmake @@ -0,0 +1,32 @@ +# - Find smi +# Find the native SMI includes and library +# +# SMI_INCLUDE_DIRS - where to find smi.h, etc. +# SMI_LIBRARIES - List of libraries when using smi. +# SMI_FOUND - True if smi found. + + +IF (SMI_INCLUDE_DIR) + # Already in cache, be silent + SET(SMI_FIND_QUIETLY TRUE) +ENDIF (SMI_INCLUDE_DIR) + +FIND_PATH(SMI_INCLUDE_DIR smi.h) + +SET(SMI_NAMES smi) +FIND_LIBRARY(SMI_LIBRARY NAMES ${SMI_NAMES} ) + +# handle the QUIETLY and REQUIRED arguments and set SMI_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(SMI DEFAULT_MSG SMI_LIBRARY SMI_INCLUDE_DIR) + +IF(SMI_FOUND) + SET( SMI_LIBRARIES ${SMI_LIBRARY} ) + SET( SMI_INCLUDE_DIRS ${SMI_INCLUDE_DIR} ) +ELSE(SMI_FOUND) + SET( SMI_LIBRARIES ) + SET( SMI_INCLUDE_DIRS ) +ENDIF(SMI_FOUND) + +MARK_AS_ADVANCED( SMI_LIBRARIES SMI_INCLUDE_DIRS ) diff --git a/cmake/modules/FindWSWIN32.cmake b/cmake/modules/FindWSWIN32.cmake index da6ab3dbae..cfa626167d 100644 --- a/cmake/modules/FindWSWIN32.cmake +++ b/cmake/modules/FindWSWIN32.cmake @@ -21,11 +21,11 @@ set(GLIB2_LIBRARIES ${WIRESHARK_LIBS}/glib/lib/gthread-${GLIB_VERSION}.lib ) -# show the GLIB2_INCLUDE_DIRS and GLIB2_LIBRARIES variables only in the advanced view -mark_as_advanced(GLIB2_INCLUDE_DIRS GLIB2_LIBRARIES) - SET(WSWIN32_FOUND TRUE) SET(WSWIN32_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS}) SET(WSWIN32_LIBRARIES ${GLIB2_LIBRARIES}) +# show the GLIB2_INCLUDE_DIRS and GLIB2_LIBRARIES variables only in the advanced view +mark_as_advanced(GLIB2_INCLUDE_DIRS GLIB2_LIBRARIES) + ENDIF() diff --git a/cmake/modules/FindZ.cmake b/cmake/modules/FindZ.cmake new file mode 100644 index 0000000000..c7217e905a --- /dev/null +++ b/cmake/modules/FindZ.cmake @@ -0,0 +1,32 @@ +# - Find zlib +# Find the native ZLIB includes and library +# +# Z_INCLUDE_DIRS - where to find zlib.h, etc. +# Z_LIBRARIES - List of libraries when using zlib. +# Z_FOUND - True if zlib found. + + +IF (Z_INCLUDE_DIRS) + # Already in cache, be silent + SET(Z_FIND_QUIETLY TRUE) +ENDIF (Z_INCLUDE_DIRS) + +FIND_PATH(Z_INCLUDE_DIR zlib.h) + +SET(Z_NAMES z zlib zdll) +FIND_LIBRARY(Z_LIBRARY NAMES ${Z_NAMES} ) + +# handle the QUIETLY and REQUIRED arguments and set Z_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Z DEFAULT_MSG Z_LIBRARY Z_INCLUDE_DIR) + +IF(Z_FOUND) + SET( Z_LIBRARIES ${Z_LIBRARY} ) + SET( Z_INCLUDE_DIRS ${Z_INCLUDE_DIR} ) +ELSE(Z_FOUND) + SET( Z_LIBRARIES ) + SET( Z_INCLUDE_DIRS ) +ENDIF(Z_FOUND) + +MARK_AS_ADVANCED( Z_LIBRARIES Z_INCLUDE_DIRS ) diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index 39a1f1aaa1..699bd26f94 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -33,6 +33,15 @@ /* Define to 1 if you have the `getprotobynumber' function. */ #cmakedefine HAVE_GETPROTOBYNUMBER 1 +/* Define to use the airpcap library */ +#cmakedefine HAVE_AIRPCAP 1 + +/* Define to use C ares library */ +#cmakedefine HAVE_C_ARES 1 + +/* Define to use SMI SNMP library */ +#cmakedefine HAVE_LIBSMI 1 + /* Define to use GNU ADNS library */ #cmakedefine HAVE_GNU_ADNS 1 diff --git a/codecs/CMakeLists.txt b/codecs/CMakeLists.txt new file mode 100644 index 0000000000..99b3f966a9 --- /dev/null +++ b/codecs/CMakeLists.txt @@ -0,0 +1,32 @@ +# 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(CODECS_FILES + G711a/G711adecode.c + G711u/G711udecode.c +) + +add_library(codecs STATIC + ${CODECS_FILES} +) + diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 6118ac6543..4b26773b58 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -21,6 +21,24 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # +if (HAVE_LIBLUA) + add_subdirectory( wslua ) + set(WSLUA_LIB wslua) +else() + set(WSLUA_LIB ) +endif() +if (HAVE_LIBPYTHON) + add_subdirectory( wspython ) + set(WSPYTHON_LIB wspython) +else() + set(WSPYTHON_LIB ) +endif() + +link_directories( + wslua + wspython +) + ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sminmpec.c COMMAND ${PERL_EXECUTABLE} @@ -1044,8 +1062,6 @@ set(FTYPE_FILES ftypes/ftype-tvbuff.c ) -# FIXME: trunk/epan/wslua/ and trunk/epan/wspython/ are missing - ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sminmpec.c COMMAND ${PERL_EXECUTABLE} @@ -1155,6 +1171,11 @@ add_library(epan SHARED ${DISSECTOR_ASM_UTILS} ) +target_link_libraries(epan + ${WSLUA_LIB} + ${PYTHON_LIB} +) + add_dependencies(epan lemon) install(TARGETS epan diff --git a/epan/wslua/CMakeLists.txt b/epan/wslua/CMakeLists.txt new file mode 100644 index 0000000000..4d542644d8 --- /dev/null +++ b/epan/wslua/CMakeLists.txt @@ -0,0 +1,107 @@ +# 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(WSLUA_MODULES + lua_bitop.c + wslua_tvb.c + wslua_proto.c + wslua_tree.c + wslua_pinfo.c + wslua_listener.c + wslua_gui.c + wslua_util.c + wslua_field.c + wslua_dumper.c +) + +set(WSLUA_FILES + ${WSLUA_MODULES} + ${CMAKE_CURRENT_BINARY_DIR}/taps_wslua.c + register_wslua.c + ${CMAKE_CURRENT_SOURCE_DIR}/init_wslua.c +) + +# Used with untypical CWD +set(WSLUA_TAPS_USED + ${CMAKE_SOURCE_DIR}/epan/dissectors/packet-http.h + ${CMAKE_SOURCE_DIR}/epan/dissectors/packet-ip.h + ${CMAKE_SOURCE_DIR}/epan/dissectors/packet-udp.h + ${CMAKE_SOURCE_DIR}/epan/dissectors/packet-h225.h + ${CMAKE_SOURCE_DIR}/epan/dissectors/packet-ieee80211.h +) + +# make-taps.pl depends on the current working directory +# to find the dissector files (contents of taps file +# depend on this actually). +ADD_CUSTOM_COMMAND( + OUTPUT + ${CMAKE_CURRENT_BINARY_DIR}/taps_wslua.c + ${CMAKE_CURRENT_BINARY_DIR}/taps.txt + COMMAND ${PERL_EXECUTABLE} + ${CMAKE_CURRENT_SOURCE_DIR}/make-taps.pl + ${CMAKE_CURRENT_SOURCE_DIR}/taps + ${CMAKE_CURRENT_BINARY_DIR}/taps_wslua.c + ${CMAKE_CURRENT_BINARY_DIR}/taps.txt + WORKING_DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/taps + ${CMAKE_CURRENT_SOURCE_DIR}/make-taps.pl + # Only here to add dependencies for the taps "source"files + ${WSLUA_TAPS_USED} +) + +ADD_CUSTOM_COMMAND( + OUTPUT + declare_wslua.h + register_wslua.c + COMMAND ${PERL_EXECUTABLE} + ${CMAKE_CURRENT_SOURCE_DIR}/make-reg.pl + ${WSLUA_MODULES} + DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/make-reg.pl + ${WSLUA_MODULES} + ${CMAKE_CURRENT_BINARY_DIR}/taps_wslua.c +) + +ADD_CUSTOM_COMMAND( + OUTPUT init.lua + COMMAND ${PERL_EXECUTABLE} + ${CMAKE_CURRENT_SOURCE_DIR}/make-init-lua.pl + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/template-init.lua + > init.lua + DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/make-init-lua.pl + ${CMAKE_CURRENT_SOURCE_DIR}/template-init.lua + ${CMAKE_SOURCE_DIR}/epan/ftypes/ftypes.h + ${CMAKE_SOURCE_DIR}/wiretap/wtap.h + ${CMAKE_SOURCE_DIR}/epan/epan.h + ${CMAKE_SOURCE_DIR}/stat_menu.h +) + +add_library(wslua STATIC + ${WSLUA_FILES} +) + |