set(CMAKE_BACKWARDS_COMPATIBILITY 2.6)
# Needs to be set after cmake_minimum_required or cmake_policy(VERSION)
-#if(COMMAND cmake_policy)
+if(COMMAND cmake_policy)
+ # Backward compatibility for versions < 2.6.3
+ cmake_policy(SET CMP0011 OLD)
# cmake_policy(SET CMP0015 NEW)
-#endif(COMMAND cmake_policy)
+endif(COMMAND cmake_policy)
# set(PROJECT_VERSION "1.3.4-rc5")
# set(PROJECT_VERSION "1.3.4rc5")
# Under linux the release mode (CMAKE_BUILD_TYPE=release) defines NDEBUG
-# Disable this later. Alternative: "make VERBOSE=1"
-set(CMAKE_VERBOSE_MAKEFILE ON)
+# Enable with: "make VERBOSE=1"
+set(CMAKE_VERBOSE_MAKEFILE OFF)
#Defines CMAKE_INSTALL_BINDIR, CMAKE_INSTALL_DATADIR, etc ...
include(CMakeInstallDirs)
-Warray-bounds
-Wcast-align
-Wformat-security
+ -Wold-style-definition
-fexcess-precision=fast
)
-Wjump-misses-init
# packet-ncp2222.inc prevents this from going into all warnings
-Wwrite-strings
+ # GLib blocks this for now.
-Wstrict-prototypes
+ # All the registration functions block these for now.
+ -Wmissing-prototypes
-Wmissing-declarations
# Problem with packet-afs.c
-Wshadow
add_definitions(
-DHAVE_CONFIG_H
- -DPACKAGE=\"wireshark\"
+ -DG_DISABLE_DEPRECATED
)
# Counterhack to work around some cache magic in CHECK_C_SOURCE_COMPILES
add_definitions( -D_U_=\"\" )
endif()
-if (NOT APPLE)
- set(WIRESHARK_LD_FLAGS
- -Wl,--as-needed
- # -flto
- # -fwhopr
- # -fwhole-program
- )
-endif()
+set(WIRESHARK_LD_FLAGS
+ -Wl,--as-needed
+ # -flto
+ # -fwhopr
+ # -fwhole-program
+)
include(CheckCLinkerFlag)
set(C 0)
set(LINK_MODE_MODULE STATIC)
else()
set(LINK_MODE_LIB SHARED)
- if(APPLE)
- set(LINK_MODE_MODULE SHARED)
- else(APPLE)
- set(LINK_MODE_MODULE MODULE)
- endif(APPLE)
+ set(LINK_MODE_MODULE MODULE)
endif()
# The packagelist is doing some magic: If we add XXX to the packagelist, we
# - set HAVE_XXX
#The minimum package list
-set(PACKAGELIST GLIB2 PCAP M LEX YACC Perl SH PythonInterp HtmlViewer ${PACKAGELIST})
+set(PACKAGELIST GLIB2 GMODULE2 M LEX YACC Perl SH PythonInterp)
+set(GLIB2_FIND_REQUIRED)
+set(GLIB2_MIN_VERSION 2.14.0)
+set(PCAP_REQUIRED)
+set(M_REQUIRED)
+
+set(PACKAGELIST ${PACKAGELIST} HtmlViewer)
+
+if(ENABLE_PCAP)
+ set(PACKAGELIST ${PACKAGELIST} PCAP)
+endif()
#Build the gui ?
if(BUILD_wireshark)
- set(PACKAGELIST GTK2 ${PACKAGELIST})
- set(GTK2_OPTIONS COMPONENTS gtk)
- set(GTK2_DEBUG false)
+ if(ENABLE_GTK3)
+ set(PACKAGELIST ${PACKAGELIST} GTK3)
+ set(ENABLE_UI_MANAGER ON)
+ else()
+ set(PACKAGELIST ${PACKAGELIST} GTK2)
+ set(GTK2_OPTIONS COMPONENTS gtk)
+ set(GTK2_FIND_VERSION 2.12)
+ set(GTK2_DEBUG false)
+ endif()
+ if(ENABLE_THREADS)
+ set(PACKAGELIST ${PACKAGELIST} GTHREAD2)
+ endif()
+endif()
+
+if(BUILD_dumpcap)
+ set(PACKAGELIST ${PACKAGELIST} GTHREAD2)
+ set(GHTREAD2_REQUIRED)
endif()
# SMI SNMP
if(ENABLE_SMI)
- set(PACKAGELIST SMI ${PACKAGELIST})
+ set(PACKAGELIST ${PACKAGELIST} SMI)
endif()
# GNU crypto
if(ENABLE_GCRYPT)
- set(PACKAGELIST GCRYPT ${PACKAGELIST})
+ set(PACKAGELIST ${PACKAGELIST} GCRYPT)
endif()
# GNU SSL/TLS support
if(ENABLE_GNUTLS)
- set(PACKAGELIST GNUTLS ${PACKAGELIST})
-endif()
-
-# Regular expressions lib
-if(ENABLE_PCRE)
- set(PACKAGELIST PCRE ${PACKAGELIST})
+ set(PACKAGELIST ${PACKAGELIST} GNUTLS)
endif()
# Kerberos
if(ENABLE_KERBEROS)
- set(PACKAGELIST KERBEROS ${PACKAGELIST})
+ set(PACKAGELIST ${PACKAGELIST} KERBEROS)
endif()
# Portable audio
if(ENABLE_PORTAUDIO)
- set(PACKAGELIST PORTAUDIO ${PACKAGELIST})
+ set(PACKAGELIST ${PACKAGELIST} PORTAUDIO)
endif()
# Prefer c-ares over adns
if(ENABLE_CARES) # C Asynchronouse resolver
- set(PACKAGELIST CARES ${PACKAGELIST})
+ set(PACKAGELIST ${PACKAGELIST} CARES)
elseif(ENABLE_ADNS) # Gnu asynchronous DNS
- set(PACKAGELIST ADNS ${PACKAGELIST})
+ set(PACKAGELIST ${PACKAGELIST} ADNS)
endif()
# Zlib compression
if(ENABLE_ZLIB)
- set(PACKAGELIST ZLIB ${PACKAGELIST})
+ set(PACKAGELIST ${PACKAGELIST} ZLIB)
endif()
# Lua 5.1 dissectors
if(ENABLE_LUA)
- set(PACKAGELIST LUA ${PACKAGELIST})
+ set(PACKAGELIST ${PACKAGELIST} LUA)
endif()
# GeoIP address resolving
if(ENABLE_GEOIP)
- set(PACKAGELIST GEOIP ${PACKAGELIST})
+ set(PACKAGELIST ${PACKAGELIST} GEOIP)
endif()
# Capabilities
if(ENABLE_CAP)
- set(PACKAGELIST CAP ${PACKAGELIST})
+ set(PACKAGELIST ${PACKAGELIST} CAP)
endif()
if(ENABLE_PYTHON)
- set(PACKAGELIST PYTHON ${PACKAGELIST})
+ set(PACKAGELIST ${PACKAGELIST} PYTHON)
endif()
+set(PACKAGELIST ${PACKAGELIST} YAPP)
+
+set(PACKAGELIST ${PACKAGELIST} POD)
+
+
set(PROGLIST text2pcap mergecap capinfos editcap dumpcap)
#Let's loop the package list
foreach(PACKAGE ${PACKAGELIST})
if(${PACKAGE}_OPTIONS)
find_package(${PACKAGE} ${${PACKAGE}_OPTIONS})
- else()
+ elseif(${PACKAGE}_REQUIRED)
find_package(${PACKAGE} REQUIRED)
+ else()
+ find_package(${PACKAGE})
endif()
message(${PACKAGE}_FOUND)
if (${PACKAGE}_FOUND)
endif()
endforeach()
-find_package(YAPP)
-
#packaging
include(CPackConfig.txt)
if(ENABLE_AIRPCAP)
set(HAVE_AIRPCAP 1)
endif()
+# No matter which version of GTK is present
+if(GTK2_FOUND OR GTK3_FOUND)
+ set(GTK_FOUND ON)
+endif()
# That's the name autofoo uses
if(HAVE_LIBZLIB)
set(HAVE_LIBZ 1)
plugins/ethercat
plugins/giop
plugins/gryphon
- plugins/interlink
plugins/irda
plugins/m2m
plugins/mate
plugins/opcua
plugins/profinet
- plugins/sercosiii
plugins/stats_tree
plugins/unistim
plugins/wimax
add_subdirectory( codecs )
add_subdirectory( epan )
-add_subdirectory( gtk )
add_subdirectory( tools/lemon )
add_subdirectory( wiretap )
add_subdirectory( wsutil )
+if(BUILD_wireshark AND GTK_FOUND)
+ add_subdirectory( gtk )
+ if (ENABLE_UI_MANAGER)
+ set(MAIN_MENU_USE_UIMANAGER 1)
+ endif()
+endif()
+
+# Basedir where to install guides
+set(DOC_DIR "$ENV{docdir}")
+message(STATUS "docdir: ${DOC_DIR}")
+
if(ENABLE_GUIDES)
add_subdirectory( docbook )
endif()
-find_package(POD)
+if(ENABLE_PCAP_NG_DEFAULT)
+ set(PCAP_NG_DEFAULT 1)
+endif()
+
+if(ENABLE_THREADS)
+ set(USE_THREADS 1)
+endif()
#Platform specific
if(UNIX)
if(WIN32)
add_definitions(-D_NEED_VAR_IMPORT_)
set(WS_VAR_IMPORT "__declspec(dllimport) extern")
+ set(WS_MSVC_NORETURN "__declspec(noreturn)")
# Disable deprecation
if(MSVC80 OR MSVC90)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
endif()
+else()
+ set(WS_MSVC_NORETURN " ")
endif()
configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h)
-# Basedir where to install guides
-set(DOC_DIR "$ENV{docdir}")
-message(STATUS "docdir: ${DOC_DIR}")
-
include(FeatureSummary)
#SET_FEATURE_INFO(NAME DESCRIPTION [URL [COMMENT] ]
PRINT_ENABLED_FEATURES()
cfile.c
clopts_common.c
disabled_protos.c
+ frame_data_sequence.c
packet-range.c
print.c
ps.c
tap-comparestat.c
tap-dcerpcstat.c
tap-diameter-avp.c
+ tap-expert.c
tap-funnel.c
tap-gsm_astat.c
tap-h225counter.c
tap-h225rassrt.c
+ tap-hosts.c
tap-httpstat.c
+ tap-icmpstat.c
+ tap-icmpv6stat.c
tap-iostat.c
tap-iousers.c
+ tap-macltestat.c
tap-mgcpstat.c
tap-megacostat.c
tap-protocolinfo.c
tap-protohierstat.c
tap-radiusstat.c
+ tap-rlcltestat.c
tap-rpcstat.c
tap-rpcprogs.c
tap-rtp.c
+ tap-rtspstat.c
tap-scsistat.c
tap-sctpchunkstat.c
tap-sipstat.c
set(INSTALL_DIRS
diameter
+ docbook
dtds
help
radius
ipmap.html
manuf
${CMAKE_BINARY_DIR}/mergecap.html
+ pdml2html.xsl
${CMAKE_BINARY_DIR}/randpkt.html
${CMAKE_BINARY_DIR}/rawshark.html
services
# @SSL_LIBS@ # -lcrypto
epan
# $(plugin_ldadd) # in case of static
- ${PCRE_LIBRARIES}
${PCAP_LIBRARIES}
${CARES_LIBRARIES}
${ADNS_LIBRARIES}
${M_LIBRARIES}
)
-if(BUILD_wireshark)
+if(BUILD_wireshark AND GTK_FOUND)
set(wireshark_LIBS
ui
${GTK2_LIBRARIES}
+ ${GTK3_LIBRARIES}
+ ${GTHREAD2_LIBRARIES}
codecs
${PORTAUDIO_LIBRARIES}
${LIBEPAN_LIBS}
proto_hier_stats.c
summary.c
tempfile.c
+ u3.c
${SHARK_COMMON_CAPTURE_SRC}
${WIRESHARK_COMMON_SRC}
)
install(TARGETS tshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
-if(BUILD_rawshark)
+if(BUILD_rawshark AND PCAP_FOUND)
set(rawshark_LIBS
${LIBEPAN_LIBS}
${APPLE_COCOA_LIBRARY}
install(TARGETS editcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
-if(BUILD_dumpcap)
+if(BUILD_dumpcap AND PCAP_FOUND)
set(dumpcap_LIBS
- wiretap
# @INET_NTOP_LO@
+ wsutil
${PCAP_LIBRARIES}
${CAP_LIBRARIES}
# @SOCKET_LIBS@
# @NSL_LIBS@
+ ${GLIB2_LIBRARIES}
+ ${GTHREAD2_LIBRARIES}
${ZLIB_LIBRARIES}
${APPLE_COCOA_LIBRARY}
)
endif()
ADD_CUSTOM_COMMAND(
- OUTPUT AUTHORS-SHORT
+ OUTPUT ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
COMMAND ${PERL}
${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl
${CMAKE_SOURCE_DIR}/doc/make-authors-short.pl
)
ADD_CUSTOM_COMMAND(
- OUTPUT AUTHORS-SHORT-FORMAT
- wireshark.pod
+ OUTPUT ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT
+ ${CMAKE_BINARY_DIR}/wireshark.pod
COMMAND ${PERL}
${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl
${CMAKE_SOURCE_DIR}/doc/make-authors-format.pl
> ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT
COMMAND cat
${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template
- AUTHORS-SHORT-FORMAT
+ ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT
> ${CMAKE_BINARY_DIR}/wireshark.pod
DEPENDS
${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl
git.samba.org / obnox / wireshark / wip.git / blobdiff