# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-project(Wireshark C)
+project(Wireshark C CXX)
cmake_minimum_required(VERSION 2.6)
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
+ -DG_DISABLE_SINGLE_INCLUDES
)
# Counterhack to work around some cache magic in CHECK_C_SOURCE_COMPILES
if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_GCC_CHECKS)
check_c_compiler_flag(-Werror WERROR)
else()
- set(WERROR 0)
+ unset(WERROR)
endif()
if(CMAKE_COMPILER_IS_GNUCC)
- add_definitions( -D_U_=__attribute__\(\(unused\)\) )
+ set (C_UNUSED "__attribute__((unused))" )
else()
- add_definitions( -D_U_=\"\" )
+ set (C_UNUSED "" )
endif()
set(WIRESHARK_LD_FLAGS
# - set HAVE_XXX
#The minimum package list
-set(PACKAGELIST GLIB2 GMODULE2 PCAP M LEX YACC Perl SH PythonInterp)
+set(PACKAGELIST GLIB2 GMODULE2 GTHREAD2 M LEX YACC Perl SH PythonInterp)
set(GLIB2_FIND_REQUIRED)
-set(GLIB2_MIN_VERSION 2.4.0)
+set(GLIB2_MIN_VERSION 2.14.0)
+set(GTHREAD2_REQUIRED)
set(PCAP_REQUIRED)
set(M_REQUIRED)
set(PACKAGELIST ${PACKAGELIST} HtmlViewer)
-#Build the gui ?
+if(ENABLE_PCAP)
+ set(PACKAGELIST ${PACKAGELIST} PCAP)
+endif()
+
+# Build the GTK-GUI?
if(BUILD_wireshark)
- set(PACKAGELIST ${PACKAGELIST} GTK2)
- set(GTK2_OPTIONS COMPONENTS gtk)
- set(GTK2_DEBUG false)
+ if(ENABLE_GTK3)
+ set(PACKAGELIST ${PACKAGELIST} GTK3)
+ else()
+ set(PACKAGELIST ${PACKAGELIST} GTK2)
+ set(GTK2_OPTIONS COMPONENTS gtk)
+ set(GTK2_FIND_VERSION 2.12)
+ set(GTK2_DEBUG false)
+ endif()
+endif()
+
+# Build the Qt GUI?
+if(BUILD_qtshark)
+ set(PACKAGELIST ${PACKAGELIST} QT)
+ # set(QT_OPTIONS 4.7.1 REQUIRED QtCore QtGui)
endif()
# SMI SNMP
set(PACKAGELIST ${PACKAGELIST} GNUTLS)
endif()
-# Regular expressions lib
-if(ENABLE_PCRE)
- set(PACKAGELIST ${PACKAGELIST} PCRE)
-endif()
-
# Kerberos
if(ENABLE_KERBEROS)
set(PACKAGELIST ${PACKAGELIST} KERBEROS)
#Let's loop the package list
foreach(PACKAGE ${PACKAGELIST})
+ if(${PACKAGE} STREQUAL "QT")
+ set(PACKAGE_NAME "Qt4")
+ else()
+ set(PACKAGE_NAME ${PACKAGE})
+ endif()
if(${PACKAGE}_OPTIONS)
- find_package(${PACKAGE} ${${PACKAGE}_OPTIONS})
+ find_package(${PACKAGE_NAME} ${${PACKAGE}_OPTIONS})
elseif(${PACKAGE}_REQUIRED)
- find_package(${PACKAGE} REQUIRED)
+ find_package(${PACKAGE_NAME} REQUIRED)
else()
- find_package(${PACKAGE})
+ find_package(${PACKAGE_NAME})
endif()
message(${PACKAGE}_FOUND)
if (${PACKAGE}_FOUND)
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)
endif()
+# QT_LIBRARIES and QT_INCLUDES are not set above. They require extra magic:
+if(QT_FOUND)
+ include(${QT_USE_FILE})
+ include_directories(${QT_INCLUDE_DIR})
+ message(STATUS "QT includes: ${QT_INCLUDE_DIR}")
+ message(STATUS "QT libs: ${QT_LIBRARIES}")
+endif()
include(ConfigureChecks.cmake)
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( wiretap )
add_subdirectory( wsutil )
-if(BUILD_wireshark AND GTK2_FOUND)
- add_subdirectory( gtk )
+if(BUILD_wireshark AND GTK_FOUND)
+ add_subdirectory( ui/gtk )
endif()
+if(BUILD_qtshark AND QT_FOUND)
+ add_subdirectory( ui/qt )
+endif()
+
+
# Basedir where to install guides
-set(DOC_DIR "$ENV{docdir}")
+set(DOC_DIR "$ENV{docdir}" CACHE FILEPATH "Installation directory for ug and dg pdfs.")
message(STATUS "docdir: ${DOC_DIR}")
if(ENABLE_GUIDES)
add_subdirectory( docbook )
endif()
+if(ENABLE_PCAP_NG_DEFAULT)
+ set(PCAP_NG_DEFAULT 1)
+endif()
+
#Platform specific
if(UNIX)
set(WS_VAR_IMPORT "extern")
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)
include(FeatureSummary)
#SET_FEATURE_INFO(NAME DESCRIPTION [URL [COMMENT] ]
+#FEATURE_SUMMARY(WHAT ALL) Requires removal of our local copy of FeatureSummary
PRINT_ENABLED_FEATURES()
PRINT_DISABLED_FEATURES()
link_directories(
- ${CMAKE_BINARY_DIR}/gtk
+ ${CMAKE_BINARY_DIR}/ui/gtk
+ ${CMAKE_BINARY_DIR}/ui/qt
${CMAKE_BINARY_DIR}/codecs
${CMAKE_BINARY_DIR}/epan
${CMAKE_BINARY_DIR}/wiretap
${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl
)
-register_tap_files(tshark-tap-register.c
- ${TSHARK_TAP_SRC}
-)
-
ADD_CUSTOM_COMMAND(
OUTPUT ps.c
COMMAND ${PYTHON_EXECUTABLE}
)
set(SHARK_COMMON_CAPTURE_SRC
- capture_errs.c
capture_ifinfo.c
capture_ui_utils.c
)
cfile.c
clopts_common.c
disabled_protos.c
+ frame_data_sequence.c
packet-range.c
print.c
ps.c
svnversion.h
sync_pipe_write.c
timestats.c
- util.c
tap-megaco-common.c
tap-rtp-common.c
version_info.c
)
set(TSHARK_TAP_SRC
- tap-afpstat.c
- tap-ansi_astat.c
- tap-bootpstat.c
- tap-camelcounter.c
- tap-camelsrt.c
- tap-comparestat.c
- tap-dcerpcstat.c
- tap-diameter-avp.c
- tap-funnel.c
- tap-gsm_astat.c
- tap-h225counter.c
- tap-h225rassrt.c
- tap-httpstat.c
- tap-iostat.c
- tap-iousers.c
- tap-mgcpstat.c
- tap-megacostat.c
- tap-protocolinfo.c
- tap-protohierstat.c
- tap-radiusstat.c
- tap-rpcstat.c
- tap-rpcprogs.c
- tap-rtp.c
- tap-scsistat.c
- tap-sctpchunkstat.c
- tap-sipstat.c
- tap-smbsids.c
- tap-smbstat.c
- tap-stats_tree.c
- tap-sv.c
- tap-wspstat.c
+ ui/cli/tap-afpstat.c
+ ui/cli/tap-ansi_astat.c
+ ui/cli/tap-bootpstat.c
+ ui/cli/tap-camelcounter.c
+ ui/cli/tap-camelsrt.c
+ ui/cli/tap-comparestat.c
+ ui/cli/tap-dcerpcstat.c
+ ui/cli/tap-diameter-avp.c
+ ui/cli/tap-expert.c
+ ui/cli/tap-follow.c
+ ui/cli/tap-funnel.c
+ ui/cli/tap-gsm_astat.c
+ ui/cli/tap-h225counter.c
+ ui/cli/tap-h225rassrt.c
+ ui/cli/tap-hosts.c
+ ui/cli/tap-httpstat.c
+ ui/cli/tap-icmpstat.c
+ ui/cli/tap-icmpv6stat.c
+ ui/cli/tap-iostat.c
+ ui/cli/tap-iousers.c
+ ui/cli/tap-macltestat.c
+ ui/cli/tap-mgcpstat.c
+ ui/cli/tap-megacostat.c
+ ui/cli/tap-protocolinfo.c
+ ui/cli/tap-protohierstat.c
+ ui/cli/tap-radiusstat.c
+ ui/cli/tap-rlcltestat.c
+ ui/cli/tap-rpcstat.c
+ ui/cli/tap-rpcprogs.c
+ ui/cli/tap-rtp.c
+ ui/cli/tap-rtspstat.c
+ ui/cli/tap-scsistat.c
+ ui/cli/tap-sctpchunkstat.c
+ ui/cli/tap-sipstat.c
+ ui/cli/tap-smbsids.c
+ ui/cli/tap-smbstat.c
+ ui/cli/tap-stats_tree.c
+ ui/cli/tap-sv.c
+ ui/cli/tap-wspstat.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 AND GTK2_FOUND)
- set(wireshark_LIBS
- ui
- ${GTK2_LIBRARIES}
- codecs
- ${PORTAUDIO_LIBRARIES}
- ${LIBEPAN_LIBS}
- ${APPLE_CORE_SERVICES_LIBRARY}
- ${APPLE_COCOA_LIBRARY}
- )
+if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) )
set(wireshark_FILES
airpcap_loader.c
alert_box.c
g711.c
merge.c
proto_hier_stats.c
+ recent.c
summary.c
tempfile.c
u3.c
+ ui/util.c
${SHARK_COMMON_CAPTURE_SRC}
${WIRESHARK_COMMON_SRC}
)
+endif()
+
+if(BUILD_wireshark AND GTK_FOUND)
+ set(wireshark_LIBS
+ gtkui
+ ${GTK2_LIBRARIES}
+ ${GTK3_LIBRARIES}
+ ${GTHREAD2_LIBRARIES}
+ codecs
+ ${PORTAUDIO_LIBRARIES}
+ ${LIBEPAN_LIBS}
+ ${APPLE_CORE_SERVICES_LIBRARY}
+ ${APPLE_COCOA_LIBRARY}
+ )
+ # qtshark and wireshark share wireshark_FILES
+
add_executable(wireshark ${wireshark_FILES})
add_dependencies(wireshark svnversion)
set_target_properties(wireshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
install(TARGETS wireshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
+if(BUILD_qtshark AND QT_FOUND)
+ set(qtshark_LIBS
+ qtui
+ ${QT_LIBRARIES}
+ ${GTHREAD2_LIBRARIES}
+ codecs
+ ${PORTAUDIO_LIBRARIES}
+ ${LIBEPAN_LIBS}
+ ${APPLE_CORE_SERVICES_LIBRARY}
+ ${APPLE_COCOA_LIBRARY}
+ )
+ # qtshark and wireshark share wireshark_FILES
+
+ add_executable(qtshark ${wireshark_FILES})
+ add_dependencies(qtshark svnversion)
+ set_target_properties(qtshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+ target_link_libraries(qtshark ${qtshark_LIBS})
+ install(TARGETS qtshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
+
+register_tap_files(tshark-tap-register.c
+ ${TSHARK_TAP_SRC}
+)
+
if(BUILD_tshark)
set(tshark_LIBS
${LIBEPAN_LIBS}
tempfile.c
tshark-tap-register.c
tshark.c
+ ui/util.c
${TSHARK_TAP_SRC}
${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}
set(rawshark_FILES
${WIRESHARK_COMMON_SRC}
rawshark.c
+ ui/util.c
)
add_executable(rawshark ${rawshark_FILES})
add_dependencies(rawshark svnversion)
)
set(dftest_FILES
dftest.c
- util.c
+ ui/util.c
)
add_executable(dftest ${dftest_FILES})
set_target_properties(dftest PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
)
set(editcap_FILES
editcap.c
- epan/crypt/crypt-md5.c
+ epan/crypt/md5.c
epan/nstime.c
${WTAP_PLUGIN_SOURCES}
)
install(TARGETS editcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
-if(BUILD_dumpcap)
+if(BUILD_dumpcap AND PCAP_FOUND)
set(dumpcap_LIBS
# @INET_NTOP_LO@
wsutil
# @SOCKET_LIBS@
# @NSL_LIBS@
${GLIB2_LIBRARIES}
+ ${GTHREAD2_LIBRARIES}
${ZLIB_LIBRARIES}
${APPLE_COCOA_LIBRARY}
)
PATTERN "Makefile.*" EXCLUDE
PATTERN "faq.py" EXCLUDE
)
+
+
+if(DOC_DIR)
+ message(STATUS "Docdir install: ${DOC_DIR}")
+ INSTALL(
+ DIRECTORY
+ ${CMAKE_BINARY_DIR}/docbook/
+ DIRECTORY_PERMISSIONS
+ OWNER_EXECUTE OWNER_WRITE OWNER_READ
+ GROUP_EXECUTE GROUP_READ
+ WORLD_EXECUTE WORLD_READ
+ DESTINATION
+ ${DOC_DIR}/guides
+ FILES_MATCHING
+ PATTERN "*.pdf"
+ )
+endif()
+
git.samba.org / obnox / wireshark / wip.git / blobdiff