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)
+# cmake_policy(SET CMP0015 NEW)
+#endif(COMMAND cmake_policy)
+
# set(PROJECT_VERSION "1.3.4-rc5")
# set(PROJECT_VERSION "1.3.4rc5")
# set(PROJECT_VERSION "1.3.4")
-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\"
- -DNEW_PACKET_LIST
)
# Counterhack to work around some cache magic in CHECK_C_SOURCE_COMPILES
set(LINK_MODE_MODULE MODULE)
endif()
+# The packagelist is doing some magic: If we add XXX to the packagelist, we
+# - may optionally set XXX_OPTIONS to pass to the find_package command
+# - will call FindXXX.cmake
+# - return found libraries in XXX_LIBRARIES
+# - return found include in XXX_INCLUDE_DIRS
+# - set HAVE_XXX
+
#The minimum package list
-set(PACKAGELIST GLIB2 PCAP M LEX YACC Perl SH PythonInterp HtmlViewer ${PACKAGELIST})
+set(PACKAGELIST GLIB2 GMODULE2 PCAP M LEX YACC Perl SH PythonInterp)
+set(GLIB2_FIND_REQUIRED)
+set(GLIB2_MIN_VERSION 2.4.0)
+set(PCAP_REQUIRED)
+set(M_REQUIRED)
+
+set(PACKAGELIST ${PACKAGELIST} HtmlViewer)
#Build the gui ?
if(BUILD_wireshark)
- set(PACKAGELIST GTK2 ${PACKAGELIST})
+ set(PACKAGELIST ${PACKAGELIST} GTK2)
set(GTK2_OPTIONS COMPONENTS gtk)
set(GTK2_DEBUG false)
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})
+ set(PACKAGELIST ${PACKAGELIST} GNUTLS)
endif()
# Regular expressions lib
if(ENABLE_PCRE)
- set(PACKAGELIST PCRE ${PACKAGELIST})
+ set(PACKAGELIST ${PACKAGELIST} PCRE)
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()
+# That's the name autofoo uses
+if(HAVE_LIBZLIB)
+ set(HAVE_LIBZ 1)
+endif()
include(ConfigureChecks.cmake)
add_subdirectory( codecs )
add_subdirectory( epan )
-add_subdirectory( gtk )
add_subdirectory( tools/lemon )
add_subdirectory( wiretap )
add_subdirectory( wsutil )
+if(BUILD_wireshark AND GTK2_FOUND)
+ add_subdirectory( gtk )
+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)
-
#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)
PRINT_DISABLED_FEATURES()
link_directories(
- gtk
- codecs
- epan
- wiretap
- wsutil
+ ${CMAKE_BINARY_DIR}/gtk
+ ${CMAKE_BINARY_DIR}/codecs
+ ${CMAKE_BINARY_DIR}/epan
+ ${CMAKE_BINARY_DIR}/wiretap
+ ${CMAKE_BINARY_DIR}/wsutil
)
ADD_CUSTOM_TARGET(
cfile.c
clopts_common.c
disabled_protos.c
+ frame_data_sequence.c
packet-range.c
print.c
ps.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-sctpchunkstat.c
- tap-sipstat.c
- tap-smbsids.c
- tap-smbstat.c
- tap-stats_tree.c
- tap-wspstat.c
+ 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-icmpstat.c
+ tap-icmpv6stat.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
)
set(INSTALL_DIRS
diameter
+ docbook
dtds
help
radius
cfilters
colorfilters
dfilters
+ ${CMAKE_BINARY_DIR}/dftest.html
${CMAKE_BINARY_DIR}/dumpcap.html
${CMAKE_BINARY_DIR}/editcap.html
${CMAKE_BINARY_DIR}/idl2wrs.html
ipmap.html
manuf
${CMAKE_BINARY_DIR}/mergecap.html
+ pdml2html.xsl
+ ${CMAKE_BINARY_DIR}/randpkt.html
${CMAKE_BINARY_DIR}/rawshark.html
services
smi_modules
)
set(LIBEPAN_LIBS
-# @GETOPT_O@ # wsgetopt.c
-# @INET_ATON_LO@ # epan/inet_aton.c
-# @INET_NTOP_LO@ # inet_ntop.c
-# @INET_PTON_LO@ # inet_pton.c
# @NSL_LIBS@ # -lnsl
# @SOCKET_LIBS@ # -lsocket
# @SSL_LIBS@ # -lcrypto
-# @STRERROR_O@ # strerror.c
-# @STRNCASECMP_O@ # strncasecmp.c
-# @STRPTIME_O@ # strptime.c
epan
# $(plugin_ldadd) # in case of static
${PCRE_LIBRARIES}
${GCRYPT_LIBRARIES}
${GNUTLS_LIBRARIES}
${SMI_LIBRARIES}
- ${Z_LIBRARIES}
+ ${ZLIB_LIBRARIES}
${M_LIBRARIES}
)
-if(BUILD_wireshark)
+if(BUILD_wireshark AND GTK2_FOUND)
set(wireshark_LIBS
ui
${GTK2_LIBRARIES}
proto_hier_stats.c
summary.c
tempfile.c
+ u3.c
${SHARK_COMMON_CAPTURE_SRC}
${WIRESHARK_COMMON_SRC}
)
add_executable(wireshark ${wireshark_FILES})
add_dependencies(wireshark svnversion)
- set_target_properties(wireshark PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+ set_target_properties(wireshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(wireshark ${wireshark_LIBS})
install(TARGETS wireshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
)
add_executable(tshark ${tshark_FILES})
add_dependencies(tshark svnversion)
- set_target_properties(tshark PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+ set_target_properties(tshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(tshark ${tshark_LIBS})
install(TARGETS tshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
)
add_executable(rawshark ${rawshark_FILES})
add_dependencies(rawshark svnversion)
- set_target_properties(rawshark PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+ set_target_properties(rawshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(rawshark ${rawshark_LIBS})
install(TARGETS rawshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
util.c
)
add_executable(dftest ${dftest_FILES})
- set_target_properties(dftest PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+ set_target_properties(dftest PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(dftest ${dftest_LIBS})
install(TARGETS dftest RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
# @NSL_LIBS@
${CARES_LIBRARIES}
${ADNS_LIBRARIES}
- ${Z_LIBRARIES}
+ ${ZLIB_LIBRARIES}
)
set(randpkt_FILES
randpkt.c
)
add_executable(randpkt ${randpkt_FILES})
- set_target_properties(randpkt PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+ set_target_properties(randpkt PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(randpkt ${randpkt_LIBS})
install(TARGETS randpkt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
set(text2pcap_LIBS
wiretap
${M_LIBRARIES}
- ${Z_LIBRARIES}
+ ${ZLIB_LIBRARIES}
)
set(text2pcap_CLEAN_FILES
text2pcap.c
)
add_executable(text2pcap ${text2pcap_FILES})
add_dependencies(text2pcap svnversion)
- set_target_properties(text2pcap PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+ set_target_properties(text2pcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(text2pcap ${text2pcap_LIBS})
install(TARGETS text2pcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if(BUILD_mergecap)
set(mergecap_LIBS
wiretap
- ${Z_LIBRARIES}
+ ${ZLIB_LIBRARIES}
)
set(mergecap_FILES
mergecap.c
)
add_executable(mergecap ${mergecap_FILES})
add_dependencies(mergecap svnversion)
- set_target_properties(mergecap PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+ set_target_properties(mergecap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(mergecap ${mergecap_LIBS})
install(TARGETS mergecap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if(BUILD_capinfos)
set(capinfos_LIBS
wiretap
- ${Z_LIBRARIES}
+ ${ZLIB_LIBRARIES}
${GCRYPT_LIBRARIES}
${APPLE_COCOA_LIBRARY}
)
${WTAP_PLUGIN_SOURCES}
)
add_executable(capinfos ${capinfos_FILES})
- set_target_properties(capinfos PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+ add_dependencies(capinfos svnversion)
+ set_target_properties(capinfos PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(capinfos ${capinfos_LIBS})
install(TARGETS capinfos RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if(BUILD_editcap)
set(editcap_LIBS
wiretap
- ${Z_LIBRARIES}
+ ${ZLIB_LIBRARIES}
)
set(editcap_FILES
editcap.c
)
add_executable(editcap ${editcap_FILES})
add_dependencies(editcap svnversion)
- set_target_properties(editcap PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+ set_target_properties(editcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(editcap ${editcap_LIBS})
install(TARGETS editcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if(BUILD_dumpcap)
set(dumpcap_LIBS
- wiretap
# @INET_NTOP_LO@
+ wsutil
${PCAP_LIBRARIES}
${CAP_LIBRARIES}
# @SOCKET_LIBS@
# @NSL_LIBS@
- ${GCRYPT_LIBRARIES}
- ${GNUTLS_LIBRARIES}
- ${Z_LIBRARIES}
+ ${GLIB2_LIBRARIES}
+ ${GTHREAD2_LIBRARIES}
+ ${ZLIB_LIBRARIES}
${APPLE_COCOA_LIBRARY}
)
set(dumpcap_FILES
)
add_executable(dumpcap ${dumpcap_FILES})
add_dependencies(dumpcap svnversion)
- set_target_properties(dumpcap PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS})
+ set_target_properties(dumpcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
target_link_libraries(dumpcap ${dumpcap_LIBS})
install(TARGETS dumpcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
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
< ${CMAKE_SOURCE_DIR}/AUTHORS
- > AUTHORS-SHORT
+ > ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
DEPENDS
${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
- < AUTHORS-SHORT
- > AUTHORS-SHORT-FORMAT
+ < ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
+ > ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT
COMMAND cat
${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template
- AUTHORS-SHORT-FORMAT
- > wireshark.pod
+ ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT
+ > ${CMAKE_BINARY_DIR}/wireshark.pod
DEPENDS
${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl
${CMAKE_SOURCE_DIR}/doc/make-authors-format.pl
- AUTHORS-SHORT
+ ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template
)
-ADD_CUSTOM_COMMAND(
- OUTPUT wireshark-filter.pod
- COMMAND tshark
- -G fields |
- ${PERL}
- ${CMAKE_SOURCE_DIR}/doc/dfilter2pod.pl
- ${CMAKE_SOURCE_DIR}/doc/wireshark-filter.pod.template
- > wireshark-filter.pod
- DEPENDS
- ${CMAKE_SOURCE_DIR}/doc/dfilter2pod.pl
- ${CMAKE_SOURCE_DIR}/doc/wireshark-filter.pod.template
- tshark
-)
-
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/capinfos 1 )
+pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/dftest 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/dumpcap 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/editcap 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/idl2wrs 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/mergecap 1 )
+pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/randpkt 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/rawshark 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/text2pcap 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/tshark 1 )
pod2manhtml( wireshark 1 )
-pod2manhtml( wireshark-filter 4 )
+pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/wireshark-filter 4 )
add_custom_target(
auxiliary ALL
DEPENDS
AUTHORS-SHORT
capinfos.html
+ dftest.html
dumpcap.html
editcap.html
idl2wrs.html
mergecap.html
+ randpkt.html
rawshark.html
text2pcap.html
tshark.html
set(MAN1_FILES
${CMAKE_BINARY_DIR}/capinfos.1
+ ${CMAKE_BINARY_DIR}/dftest.1
${CMAKE_BINARY_DIR}/dumpcap.1
${CMAKE_BINARY_DIR}/editcap.1
${CMAKE_BINARY_DIR}/idl2wrs.1
${CMAKE_BINARY_DIR}/mergecap.1
+ ${CMAKE_BINARY_DIR}/randpkt.1
${CMAKE_BINARY_DIR}/rawshark.1
${CMAKE_BINARY_DIR}/text2pcap.1
${CMAKE_BINARY_DIR}/tshark.1
git.samba.org / obnox / wireshark / wip.git / blobdiff