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)
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)
# - 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)
set(GLIB2_FIND_REQUIRED)
set(GLIB2_MIN_VERSION 2.14.0)
+set(GTHREAD2_REQUIRED)
set(PCAP_REQUIRED)
set(M_REQUIRED)
set(PACKAGELIST ${PACKAGELIST} HtmlViewer)
+if(ENABLE_PCAP)
+ set(PACKAGELIST ${PACKAGELIST} PCAP)
+endif()
+
#Build the gui ?
if(BUILD_wireshark)
if(ENABLE_GTK3)
set(PACKAGELIST ${PACKAGELIST} GTK3)
- set(UI_MANAGER ON)
else()
set(PACKAGELIST ${PACKAGELIST} GTK2)
set(GTK2_OPTIONS COMPONENTS gtk)
endif()
endif()
-if(BUILD_dumpcap)
- set(PACKAGELIST ${PACKAGELIST} GTHREAD2)
- set(GHTREAD2_REQUIRED)
-endif()
-
# SMI SNMP
if(ENABLE_SMI)
set(PACKAGELIST ${PACKAGELIST} SMI)
set(PACKAGELIST ${PACKAGELIST} GNUTLS)
endif()
-# Regular expressions lib
-if(ENABLE_PCRE)
- set(PACKAGELIST ${PACKAGELIST} PCRE)
-endif()
-
# Kerberos
if(ENABLE_KERBEROS)
set(PACKAGELIST ${PACKAGELIST} KERBEROS)
#packaging
include(CPackConfig.txt)
-if(HAVE_LIBPYTHON)
+if(PYTHON_FOUND)
set(HAVE_PYTHON 1)
set(PYTHON_DIR "${CMAKE_INSTALL_PREFIX}/lib/wireshark/python/${CPACK_PACKAGE_VERSION}")
endif()
add_subdirectory( wsutil )
if(BUILD_wireshark AND GTK_FOUND)
- add_subdirectory( gtk )
+ add_subdirectory( ui/gtk )
endif()
# Basedir where to install guides
PRINT_DISABLED_FEATURES()
link_directories(
- ${CMAKE_BINARY_DIR}/gtk
+ ${CMAKE_BINARY_DIR}/ui/gtk
${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
)
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
# @SSL_LIBS@ # -lcrypto
epan
# $(plugin_ldadd) # in case of static
- ${PCRE_LIBRARIES}
${PCAP_LIBRARIES}
${CARES_LIBRARIES}
${ADNS_LIBRARIES}
ui
${GTK2_LIBRARIES}
${GTK3_LIBRARIES}
+ ${GTHREAD2_LIBRARIES}
codecs
${PORTAUDIO_LIBRARIES}
${LIBEPAN_LIBS}
g711.c
merge.c
proto_hier_stats.c
+ recent.c
summary.c
tempfile.c
u3.c
install(TARGETS wireshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
+register_tap_files(tshark-tap-register.c
+ ${TSHARK_TAP_SRC}
+)
+
if(BUILD_tshark)
set(tshark_LIBS
${LIBEPAN_LIBS}
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(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