file(STRINGS
${CMAKE_SOURCE_DIR}/configure.ac
PROJECT_MAJOR_VERSION_TMP
- REGEX "^m4_define\\(version_major, [0-9]+\\)"
+ REGEX "^m4_define\\(\\[?version_major\\]?, *\\[?[0-9]+\\]?\\)"
)
file(STRINGS
${CMAKE_SOURCE_DIR}/configure.ac
PROJECT_MINOR_VERSION_TMP
- REGEX "^m4_define\\(version_minor, [0-9]+\\)"
+ REGEX "^m4_define\\(\\[?version_minor\\]?, *\\[?[0-9]+\\]?\\)"
)
file(STRINGS
${CMAKE_SOURCE_DIR}/configure.ac
PROJECT_PATCH_VERSION_TMP
- REGEX "^m4_define\\(version_micro, [0-9]+\\)"
+ REGEX "^m4_define\\(\\[?version_micro\\]?, *\\[?[0-9]+\\]?\\)"
)
# XXX pull VERSION_EXTENSION out of configure.ac ?
- string(REGEX REPLACE "m4_define\\(version_major, ([0-9]+)\\)"
+ string(REGEX REPLACE "m4_define\\(\\[?version_major\\]?, *\\[?([0-9]+)\\]?\\)"
"\\1"
PROJECT_MAJOR_VERSION
${PROJECT_MAJOR_VERSION_TMP}
)
- string(REGEX REPLACE "m4_define\\(version_minor, ([0-9]+)\\)"
+ string(REGEX REPLACE "m4_define\\(\\[?version_minor\\]?, *\\[?([0-9]+)\\]?\\)"
"\\1"
PROJECT_MINOR_VERSION
${PROJECT_MINOR_VERSION_TMP}
)
- string(REGEX REPLACE "m4_define\\(version_micro, ([0-9]+)\\)"
+ string(REGEX REPLACE "m4_define\\(\\[?version_micro\\]?, *\\[?([0-9]+)\\]?\\)"
"\\1"
PROJECT_PATCH_VERSION
${PROJECT_PATCH_VERSION_TMP}
INCLUDE(UseLemon)
INCLUDE(UseMakeDissectorReg)
INCLUDE(UseMakeTapReg)
+INCLUDE(UseAsn2Wrs)
# Under linux the release mode (CMAKE_BUILD_TYPE=release) defines NDEBUG
include(CMakeOptions.txt)
-
-set(WIRESHARK_C_FLAGS
- -O2
- -g
- -Wall
- -W
- -Wextra
- -Wendif-labels
- -Wpointer-arith
- -Warray-bounds
- -Wcast-align
- -Wformat-security
- -fexcess-precision=fast
-)
-
-set(WIRESHARK_C_ONLY_FLAGS
- # The following are C only, not C++
- -Wdeclaration-after-statement
- -Wno-pointer-sign
- -Wold-style-definition
-)
-
-set(WIRESHARK_EXTRA_C_FLAGS
- -pedantic
- -Woverflow
- -Wlogical-op
- -Wno-overlength-strings
- -fstrict-overflow -Wstrict-overflow=4
- -Wunreachable-code
- -Wunsafe-loop-optimizations
- -Wno-long-long
- -Wcast-qual
- -Waddress
- -Warray-bounds
- -Wattributes
- -Wdiv-by-zero
- -Wformat-security
- -Wignored-qualifiers
- -Wpragmas
- -Wredundant-decls
- -Wvla
- # packet-ncp2222.inc prevents this from going into all warnings
- -Wwrite-strings
- # All the registration functions block these for now.
- -Wmissing-declarations
- # Problem with packet-afs.c
- -Wshadow
- # More cleanup needed for this on LP64
- -Wshorten-64-to-32
-
-)
-
-set(WIRESHARK_EXTRA_C_ONLY_FLAGS
- # The following are C only, not C++
- -Wbad-function-cast
- -Wc++-compat
- -Wjump-misses-init
- # GLib blocks this for now.
- -Wstrict-prototypes
- # All the registration functions block these for now.
- -Wmissing-prototypes
-)
-
-if(ENABLE_EXTRA_GCC_CHECKS) # This overrides -Werror
- set(WIRESHARK_C_FLAGS ${WIRESHARK_C_FLAGS} ${WIRESHARK_EXTRA_C_FLAGS})
- set(WIRESHARK_C_ONLY_FLAGS ${WIRESHARK_C_ONLY_FLAGS} ${WIRESHARK_EXTRA_C_ONLY_FLAGS})
+if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
+ set(LOCAL_CFLAGS
+ /Zi
+ /W3
+ /MDd
+ /DWIN32_LEAN_AND_MEAN
+ "/DMSC_VER_REQUIRED=${MSC_VER_REQUIRED}"
+ /D_CRT_SECURE_NO_DEPRECATE
+ /D_CRT_NONSTDC_NO_DEPRECATE
+ /MP
+ # NOMINMAX keeps windows.h from defining "min" and "max" via windef.h.
+ # This avoids conflicts with the C++ standard library.
+ /DNOMINMAX
+ )
+
+ if(NOT WIN64)
+ set(LOCAL_CFLAGS ${LOCAL_CFLAGS} "/D_BIND_TO_CURRENT_CRT_VERSION=1")
+ endif()
+
+ # Additional compiler warnings to be treated as "Level 3"
+ # when compiling Wireshark sources. (Selected from "level 4" warnings).
+ ## 4295: array is too small to include a terminating null character
+ set(WARNINGS_CFLAGS "/w34295")
+
+ set(WIRESHARK_C_FLAGS
+ # FIXME: This doen't work as PCAP_VERSION will be determined later
+ "/DPCAP_VERSION=${PCAP_VERSION}"
+ ${LOCAL_CFLAGS}
+ ${WARNINGS_CFLAGS}
+ )
+else()
+ set(WIRESHARK_C_FLAGS
+ -O2
+ -g
+ -Wall
+ -W
+ -Wextra
+ -Wendif-labels
+ -Wpointer-arith
+ -Warray-bounds
+ -Wformat-security
+ -Wshorten-64-to-32
+ -Wvla
+ -Waddress
+ -Warray-bounds
+ -Wattributes
+ -Wdiv-by-zero
+ -Wignored-qualifiers
+ -Wno-overlength-strings
+ -Wwrite-strings
+ -Wno-long-long
+ -Wpragmas
+ )
+
+ set(WIRESHARK_C_ONLY_FLAGS
+ # The following are C only, not C++
+ -Wc++-compat
+ -Wdeclaration-after-statement
+ -Wshadow
+ -Wno-pointer-sign
+ -Wold-style-definition
+ -Wstrict-prototypes
+ -Wlogical-op
+ -Wjump-misses-init
+ )
+
+ set(WIRESHARK_EXTRA_C_FLAGS
+ -pedantic
+ -Woverflow
+ -fstrict-overflow -Wstrict-overflow=4
+ -Wunreachable-code
+ -Wunsafe-loop-optimizations
+ -Wcast-align
+ -Wcast-qual
+ -Wformat-security
+ -Wredundant-decls
+ # All the registration functions block these for now.
+ -Wmissing-declarations
+ )
+
+ set(WIRESHARK_EXTRA_C_ONLY_FLAGS
+ # The following are C only, not C++
+ -Wbad-function-cast
+ # All the registration functions block these for now.
+ -Wmissing-prototypes
+ )
+
+ # With clang some tests don't fail properly during testing but only
+ # during real compiles
+
+ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+ set(WIRESHARK_C_FLAGS ${WIRESHARK_C_FLAGS}
+ -Qunused-arguments
+ #-fcolor-diagnostics
+ )
+ else()
+ set(WIRESHARK_C_FLAGS ${WIRESHARK_C_FLAGS}
+ -fexcess-precision=fast
+ )
+
+ set(WIRESHARK_C_ONLY_FLAGS ${WIRESHARK_C_ONLY_FLAGS}
+ )
+ endif()
+
+ if(ENABLE_EXTRA_GCC_CHECKS) # This overrides -Werror
+ set(WIRESHARK_C_FLAGS ${WIRESHARK_C_FLAGS} ${WIRESHARK_EXTRA_C_FLAGS})
+ set(WIRESHARK_C_ONLY_FLAGS ${WIRESHARK_C_ONLY_FLAGS} ${WIRESHARK_EXTRA_C_ONLY_FLAGS})
+ endif()
+
+ add_definitions(
+ -DG_DISABLE_DEPRECATED
+ -DG_DISABLE_SINGLE_INCLUDES
+ )
endif()
-add_definitions(
- -DHAVE_CONFIG_H
- -DG_DISABLE_DEPRECATED
- -DG_DISABLE_SINGLE_INCLUDES
-)
-
# Counterhack to work around some cache magic in CHECK_C_SOURCE_COMPILES
include(CheckCCompilerFlag)
+
+if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_GCC_CHECKS)
+ check_c_compiler_flag(-Werror=unknown-warning-option WERR_UNKNOWN)
+ check_c_compiler_flag(-Werror WERROR)
+else()
+ unset(WERR_UNKNOWN)
+ unset(WERROR)
+endif()
+# string of additional compile command line flags for check_c_compiler_flag
+if(WERR_UNKNOWN)
+ set(CMAKE_REQUIRED_FLAGS -Werror=unknown-warning-option )
+endif()
+
set(C 0)
# Sigh: Have to use THIS_FLAG instead of ${F} for some reason
foreach(THIS_FLAG ${WIRESHARK_C_FLAGS})
set(F WS_C_FLAG_${C})
set(${F} ${THIS_FLAG})
set(V WS_C_FLAG_VALID${C})
+ message(STATUS "Checking for flag: ${${F}}")
check_c_compiler_flag(${${F}} ${V})
if (${${V}})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${F}}")
set(F WS_C_FLAG_${C})
set(${F} ${THIS_FLAG})
set(V WS_C_FLAG_VALID${C})
+ message(STATUS "Checking for flag: ${${F}}")
check_c_compiler_flag(${${F}} ${V})
if (${${V}})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${F}}")
endforeach()
message(STATUS "C-Flags: ${CMAKE_C_FLAGS}\nCXX-Flags: ${CMAKE_CXX_FLAGS}")
-if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_GCC_CHECKS)
- check_c_compiler_flag(-Werror WERROR)
-else()
- unset(WERROR)
+check_c_compiler_flag(-fvisibility=hidden FVHIDDEN)
+if((FVHIDDEN))
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
+else() # TODO add alternate compiler flags for hiding symbols
+ message(WARNING "Hiding shared library symbols is not supported by the compiler."
+ " All shared library symbols will be exported.")
endif()
-if(CMAKE_COMPILER_IS_GNUCC)
+if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
set (C_UNUSED "__attribute__((unused))" )
else()
set (C_UNUSED "" )
endif()
-set(WIRESHARK_LD_FLAGS
- -Wl,--as-needed
- # -flto
- # -fwhopr
- # -fwhole-program
-)
+
+if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
+ # Set in Makefile.nmake but doesn't seem to have any effect
+ # set(WIRESHARK_LD_FLAGS
+ # /LARGEADDRESSAWARE
+ # )
+else()
+ set(WIRESHARK_LD_FLAGS
+ -Wl,--as-needed
+ # -flto
+ # -fwhopr
+ # -fwhole-program
+ )
+endif()
include(CheckCLinkerFlag)
set(C 0)
set(LINK_MODE_MODULE MODULE)
endif()
+if(APPLE AND EXISTS /usr/local/opt/gettext)
+ # GLib on OS X requires libintl. Homebrew installs gettext (and
+ # libintl) in /usr/local/opt/gettext
+ include_directories(/usr/local/opt/gettext/include)
+ link_directories(/usr/local/opt/gettext/lib)
+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
# - set HAVE_XXX
#The minimum package list
-set(PACKAGELIST GLIB2 GMODULE2 GTHREAD2 M LEX YACC Perl SH PythonInterp)
+set(PACKAGELIST Gettext GLIB2 GMODULE2 GTHREAD2 M LEX YACC Perl SH PythonInterp)
set(GLIB2_FIND_REQUIRED)
set(GLIB2_MIN_VERSION 2.14.0)
set(GTHREAD2_REQUIRED)
-set(PCAP_REQUIRED)
set(M_REQUIRED)
+set(PythonInterp_FIND_VERSION 2)
+set(Python_ADDITIONAL_VERSIONS 3)
set(PACKAGELIST ${PACKAGELIST} HtmlViewer)
set(PACKAGELIST ${PACKAGELIST} PCAP)
endif()
+if(ENABLE_AIRPCAP)
+ set(PACKAGELIST ${PACKAGELIST} AIRPCAP)
+endif()
+
# Build the GTK-GUI?
if(BUILD_wireshark)
if(ENABLE_GTK3)
# Build the Qt GUI?
if(BUILD_qtshark)
- set(PACKAGELIST ${PACKAGELIST} QT)
- # set(QT_OPTIONS 4.7.1 REQUIRED QtCore QtGui)
+ if(ENABLE_QT5)
+ set(PACKAGELIST ${PACKAGELIST} Qt5Widgets Qt5PrintSupport Qt5LinguistTools)
+ if (APPLE)
+ set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras)
+ endif()
+ set(QT_VERSION 5)
+ # Untested, may not work if CMAKE_PREFIX_PATH gets overwritten
+ # somewhere. The if WIN32 in this place is annoying as well.
+ if( WIN32 )
+ set( QT5_BASE_PATH "$ENV{QT5_BASE_DIR}" )
+ set( CMAKE_PREFIX_PATH "${QT5_BASE_PATH}\\msvc2010" )
+ set( QT5_DLL_PATH "${CMAKE_PREFIX_PATH}/bin/dummy" )
+ set( WS_ALL_LIBS ${WS_ALL_LIBS} ${QT5_DLL_PATH} )
+ endif()
+ else()
+ set(PACKAGELIST ${PACKAGELIST} Qt4)
+ # set(Qt4_OPTIONS 4.7.1 REQUIRED QtCore QtGui)
+ set(QT_VERSION 4)
+ endif()
endif()
# SMI SNMP
endif()
# Portable audio
-if(ENABLE_PORTAUDIO)
+if(ENABLE_PORTAUDIO AND BUILD_wireshark)
set(PACKAGELIST ${PACKAGELIST} PORTAUDIO)
endif()
endif()
if(ENABLE_PYTHON)
- set(PACKAGELIST ${PACKAGELIST} PYTHON)
+ set(PACKAGELIST ${PACKAGELIST} PythonLibs)
endif()
set(PACKAGELIST ${PACKAGELIST} YAPP)
set(PACKAGELIST ${PACKAGELIST} POD)
-set(PROGLIST text2pcap mergecap capinfos editcap dumpcap)
+set(PROGLIST text2pcap mergecap capinfos editcap reordercap dumpcap)
+#Sort the package list
+list(SORT PACKAGELIST)
+message(STATUS "Packagelist: ${PACKAGELIST}")
#Let's loop the package list
foreach(PACKAGE ${PACKAGELIST})
- if(${PACKAGE} STREQUAL "QT")
- set(PACKAGE_NAME "Qt4")
+ if(${PACKAGE} STREQUAL "Qt4")
+ set(PACKAGE_VAR "QT")
+ elseif(${PACKAGE} STREQUAL "PythonInterp")
+ set(PACKAGE_VAR "PYTHON")
+ elseif(${PACKAGE} STREQUAL "PythonLibs")
+ set(PACKAGE_VAR "PYTHON")
else()
- set(PACKAGE_NAME ${PACKAGE})
+ set(PACKAGE_VAR ${PACKAGE})
endif()
if(${PACKAGE}_OPTIONS)
- find_package(${PACKAGE_NAME} ${${PACKAGE}_OPTIONS})
+ find_package(${PACKAGE} ${${PACKAGE}_OPTIONS})
elseif(${PACKAGE}_REQUIRED)
- find_package(${PACKAGE_NAME} REQUIRED)
+ find_package(${PACKAGE} REQUIRED)
else()
- find_package(${PACKAGE_NAME})
+ find_package(${PACKAGE})
endif()
- message(${PACKAGE}_FOUND)
- if (${PACKAGE}_FOUND)
- set(HAVE_LIB${PACKAGE} 1)
- include_directories(${${PACKAGE}_INCLUDE_DIRS})
- message(STATUS "${PACKAGE} includes: ${${PACKAGE}_INCLUDE_DIRS}")
- message(STATUS "${PACKAGE} libs: ${${PACKAGE}_LIBRARIES}")
+ message(${PACKAGE_VAR}_FOUND)
+ if (${PACKAGE_VAR}_FOUND)
+ set(HAVE_LIB${PACKAGE_VAR} 1)
+ include_directories(${${PACKAGE_VAR}_INCLUDE_DIRS})
+ set(WS_ALL_LIBS ${WS_ALL_LIBS} ${${PACKAGE_VAR}_LIBRARIES})
+ message(STATUS "${PACKAGE} includes: ${${PACKAGE_VAR}_INCLUDE_DIRS}")
+ message(STATUS "${PACKAGE} libs: ${${PACKAGE_VAR}_LIBRARIES}")
+ if (${PACKAGE}_DEFINITIONS)
+ message(STATUS "${PACKAGE} definitions: ${${PACKAGE_VAR}_DEFINITIONS}")
+ endif()
+ if (${PACKAGE_VAR}_EXECUTABLE)
+ message(STATUS "${PACKAGE} executable: ${${PACKAGE_VAR}_EXECUTABLE}")
+ endif()
endif()
endforeach()
+# Provide Windows system lib names
+include( UseWinLibs )
+
+# Create file to set paths to run binaries from build dir
+WSExtendPath( "${WS_ALL_LIBS}" "${CMAKE_BINARY_DIR}/setpath.bat" )
+
#packaging
include(CPackConfig.txt)
if(HAVE_LIBADNS)
set(HAVE_GNU_ADNS 1)
endif()
-if(ENABLE_AIRPCAP)
- set(HAVE_AIRPCAP 1)
-endif()
-if(HAVE_LIBNL AND ENABLE_AIRPCAP)
+if(HAVE_LIBNL AND HAVE_AIRPCAP)
message(ERROR "Airpcap and Libnl support are mutually exclusive")
endif()
# No matter which version of GTK is present
if(HAVE_LIBZLIB)
set(HAVE_LIBZ 1)
endif()
-# QT_LIBRARIES and QT_INCLUDES are not set above. They require extra magic:
-if(QT_FOUND)
+if (Qt5Widgets_FOUND)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+ if (Qt5_POSITION_INDEPENDENT_CODE)
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ endif()
+ set (QT_FOUND ON)
+ set (QT_LIBRARIES ${Qt5Widgets_LIBRARIES} ${Qt5PrintSupport_LIBRARIES})
+ if(Qt5MacExtras_FOUND)
+ set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
+ # That's the name autofoo uses
+ set(QT_MACEXTRAS_LIB 1)
+ endif()
+# If Qt4: QT_LIBRARIES and QT_INCLUDES are not set above. They require extra magic
+elseif(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)
#Big or little endian ?
set(DATAFILE_DIR "${CMAKE_INSTALL_PREFIX}/share/${CPACK_PACKAGE_NAME}")
+SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
+
if(ENABLE_PLUGINS)
set(HAVE_PLUGINS 1)
set(PLUGIN_DIR="${DATAFILE_DIR}/plugins/${CPACK_PACKAGE_VERSION}")
add_subdirectory( ${PLUGIN_DIR} )
endforeach()
+add_subdirectory( asn1 EXCLUDE_FROM_ALL )
add_subdirectory( codecs )
add_subdirectory( epan )
add_subdirectory( tools/lemon )
+add_subdirectory( ui )
add_subdirectory( wiretap )
add_subdirectory( wsutil )
-if((BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND))
- add_subdirectory( ui )
+add_custom_target(dumpabi DEPENDS dumpabi-libwireshark dumpabi-libwiretap dumpabi-libwsutil color.h)
+
+if(ENABLE_ECHLD)
+ add_subdirectory( echld )
endif()
if(BUILD_wireshark AND GTK_FOUND)
set(PCAP_NG_DEFAULT 1)
endif()
-#Platform specific
-if(UNIX)
- set(WS_VAR_IMPORT "extern")
-endif()
+# Large file support (e.g. make off_t 64 bit if supported)
+include(gmxTestLargeFiles)
+gmx_test_large_files(GMX_LARGEFILES)
+
+add_definitions( -DTOP_SRCDIR=\"${CMAKE_SOURCE_DIR}\" )
if(APPLE)
-#TODO verify that APPLE implies HAVE_OS_X_FRAMEWORKS
+ #
+ # We assume that APPLE means OS X so that we have the OS X
+ # frameworks.
+ #
set(HAVE_OS_X_FRAMEWORKS 1)
- FIND_LIBRARY (APPLE_CORE_SERVICES_LIBRARY CoreServices)
- FIND_LIBRARY (APPLE_COCOA_LIBRARY Cocoa)
+ FIND_LIBRARY (APPLE_APPLICATION_SERVICES_LIBRARY ApplicationServices)
+ FIND_LIBRARY (APPLE_CORE_FOUNDATION_LIBRARY CoreFoundation)
+ FIND_LIBRARY (APPLE_SYSTEM_CONFIGURATION_LIBRARY SystemConfiguration)
endif()
if(WIN32)
- add_definitions(-D_NEED_VAR_IMPORT_)
- set(WS_VAR_IMPORT "__declspec(dllimport) extern")
set(WS_MSVC_NORETURN "__declspec(noreturn)")
# Disable deprecation
configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h)
+set( configure_input "Built with CMake ${CMAKE_VERSION}" )
+set( VERSION ${PROJECT_VERSION} )
+
+configure_file(
+ ${CMAKE_SOURCE_DIR}/packaging/macosx/Info.plist.in
+ ${CMAKE_SOURCE_DIR}/packaging/macosx/Info.plist
+ @ONLY)
+
include(FeatureSummary)
#SET_FEATURE_INFO(NAME DESCRIPTION [URL [COMMENT] ]
#FEATURE_SUMMARY(WHAT ALL) Requires removal of our local copy of FeatureSummary
ADD_CUSTOM_TARGET(
svnversion ALL
- COMMAND ${PERL}
+ COMMAND ${PERL_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl
${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl
)
+set_target_properties(svnversion PROPERTIES FOLDER "Auxiliary")
ADD_CUSTOM_COMMAND(
OUTPUT svnversion.h
- COMMAND ${PERL}
+ COMMAND ${PERL_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl
${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl
)
-ADD_CUSTOM_COMMAND(
- OUTPUT ps.c
- COMMAND ${PYTHON_EXECUTABLE}
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/rdps.py
- ${CMAKE_CURRENT_SOURCE_DIR}/print.ps
- ps.c
- DEPENDS
- ${CMAKE_CURRENT_SOURCE_DIR}/tools/rdps.py
- ${CMAKE_CURRENT_SOURCE_DIR}/print.ps
-)
-
if(UNIX)
- set(PLATFORM_SRC
+ set(PLATFORM_CAPTURE_SRC
capture-pcap-util-unix.c
)
endif()
if(WIN32)
- set(PLATFORM_SRC
- capture-wpcap.c capture_wpcap_packet.c
+ set(PLATFORM_CAPTURE_SRC
+ capture_win_ifnames.c
+ capture-wpcap.c
+ capture_wpcap_packet.c
+ )
+ set(PLATFORM_UI_SRC
+ ui/win32/console_win32.c
+ ui/win32/file_dlg_win32.c
+ ui/win32/print_win32.c
)
endif()
set(WTAP_PLUGIN_SOURCES
epan/plugins.c
- epan/report_err.c
epan/filesystem.c
)
)
set(WIRESHARK_COMMON_SRC
- ${PLATFORM_SRC}
+ ${PLATFORM_CAPTURE_SRC}
capture-pcap-util.c
cfile.c
+ cfutils.c
clopts_common.c
- disabled_protos.c
- frame_data_sequence.c
- packet-range.c
- print.c
- ps.c
+ frame_tvbuff.c
svnversion.h
sync_pipe_write.c
- timestats.c
- tap-megaco-common.c
- tap-rtp-common.c
version_info.c
)
${CMAKE_BINARY_DIR}/dftest.html
${CMAKE_BINARY_DIR}/dumpcap.html
${CMAKE_BINARY_DIR}/editcap.html
+ ${CMAKE_BINARY_DIR}/asn2deb.html
+ ${CMAKE_BINARY_DIR}/idl2deb.html
${CMAKE_BINARY_DIR}/idl2wrs.html
ipmap.html
manuf
pdml2html.xsl
${CMAKE_BINARY_DIR}/randpkt.html
${CMAKE_BINARY_DIR}/rawshark.html
+ ${CMAKE_BINARY_DIR}/reordercap.html
services
smi_modules
${CMAKE_BINARY_DIR}/text2pcap.html
# @SSL_LIBS@ # -lcrypto
epan
# $(plugin_ldadd) # in case of static
+ ${AIRPCAP_LIBRARIES}
${PCAP_LIBRARIES}
${CARES_LIBRARIES}
${ADNS_LIBRARIES}
file.c
fileset.c
filters.c
- g711.c
iface_monitor.c
- merge.c
proto_hier_stats.c
- recent.c
summary.c
- tempfile.c
- u3.c
ws80211_utils.c
${SHARK_COMMON_CAPTURE_SRC}
${WIRESHARK_COMMON_SRC}
+ ${PLATFORM_UI_SRC}
)
endif()
codecs
${PORTAUDIO_LIBRARIES}
${LIBEPAN_LIBS}
+ ${APPLE_APPLICATION_SERVICES_LIBRARY}
${APPLE_CORE_SERVICES_LIBRARY}
- ${APPLE_COCOA_LIBRARY}
+ ${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
${NL_LIBRARIES}
+ ${WIN_COMCTL32_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}")
+ set_target_properties(wireshark PROPERTIES FOLDER "Executables")
target_link_libraries(wireshark ${wireshark_LIBS})
install(TARGETS wireshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
${QT_LIBRARIES}
${GTHREAD2_LIBRARIES}
codecs
- ${PORTAUDIO_LIBRARIES}
${LIBEPAN_LIBS}
- ${APPLE_CORE_SERVICES_LIBRARY}
- ${APPLE_COCOA_LIBRARY}
+ ${APPLE_APPLICATION_SERVICES_LIBRARY}
+ ${APPLE_CORE_FOUNDATION_LIBRARY}
+ ${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
${NL_LIBRARIES}
)
# 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}")
+ set_target_properties(qtshark PROPERTIES FOLDER "Executables")
target_link_libraries(qtshark ${qtshark_LIBS})
install(TARGETS qtshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
register_tap_files(tshark-tap-register.c
+ tshark-taps
${TSHARK_TAP_SRC}
)
if(BUILD_tshark)
set(tshark_LIBS
+ ui
${LIBEPAN_LIBS}
- ${APPLE_COCOA_LIBRARY}
+ ${APPLE_CORE_FOUNDATION_LIBRARY}
+ ${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
)
set(tshark_FILES
capture_opts.c
capture_sync.c
- tempfile.c
tshark-tap-register.c
tshark.c
- ui/util.c
${TSHARK_TAP_SRC}
${SHARK_COMMON_CAPTURE_SRC}
${WIRESHARK_COMMON_SRC}
add_executable(tshark ${tshark_FILES})
add_dependencies(tshark svnversion)
set_target_properties(tshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+ set_target_properties(tshark PROPERTIES FOLDER "Executables")
target_link_libraries(tshark ${tshark_LIBS})
install(TARGETS tshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if(BUILD_rawshark AND PCAP_FOUND)
set(rawshark_LIBS
${LIBEPAN_LIBS}
- ${APPLE_COCOA_LIBRARY}
+ ${APPLE_CORE_FOUNDATION_LIBRARY}
+ ${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
)
set(rawshark_FILES
${WIRESHARK_COMMON_SRC}
add_executable(rawshark ${rawshark_FILES})
add_dependencies(rawshark svnversion)
set_target_properties(rawshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+ set_target_properties(rawshark PROPERTIES FOLDER "Executables")
target_link_libraries(rawshark ${rawshark_LIBS})
install(TARGETS rawshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
)
add_executable(dftest ${dftest_FILES})
set_target_properties(dftest PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+ set_target_properties(dftest PROPERTIES FOLDER "Executables")
target_link_libraries(dftest ${dftest_LIBS})
install(TARGETS dftest RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if(BUILD_randpkt)
set(randpkt_LIBS
wiretap
+ wsutil
${M_LIBRARIES}
${PCAP_LIBRARIES}
# @SOCKET_LIBS@
)
add_executable(randpkt ${randpkt_FILES})
set_target_properties(randpkt PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+ set_target_properties(randpkt PROPERTIES FOLDER "Executables")
target_link_libraries(randpkt ${randpkt_LIBS})
install(TARGETS randpkt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if(BUILD_text2pcap)
set(text2pcap_LIBS
- wiretap
+ wsutil
${M_LIBRARIES}
${ZLIB_LIBRARIES}
)
set(text2pcap_CLEAN_FILES
text2pcap.c
+ pcapio.c
)
set(text2pcap_FILES
${text2pcap_CLEAN_FILES}
add_executable(text2pcap ${text2pcap_FILES})
add_dependencies(text2pcap svnversion)
set_target_properties(text2pcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+ set_target_properties(text2pcap PROPERTIES FOLDER "Executables")
target_link_libraries(text2pcap ${text2pcap_LIBS})
install(TARGETS text2pcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
set(mergecap_LIBS
wiretap
${ZLIB_LIBRARIES}
+ ${CMAKE_DL_LIBS}
)
set(mergecap_FILES
mergecap.c
- merge.c
svnversion.h
+ ${WTAP_PLUGIN_SOURCES}
)
add_executable(mergecap ${mergecap_FILES})
add_dependencies(mergecap svnversion)
set_target_properties(mergecap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+ set_target_properties(mergecap PROPERTIES FOLDER "Executables")
target_link_libraries(mergecap ${mergecap_LIBS})
install(TARGETS mergecap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
+if(BUILD_reordercap)
+ set(reordercap_LIBS
+ wiretap
+ ${ZLIB_LIBRARIES}
+ ${CMAKE_DL_LIBS}
+ )
+ set(reordercap_FILES
+ reordercap.c
+ svnversion.h
+ ${WTAP_PLUGIN_SOURCES}
+ )
+ add_executable(reordercap ${reordercap_FILES})
+ add_dependencies(reordercap svnversion)
+ set_target_properties(reordercap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+ set_target_properties(reordercap PROPERTIES FOLDER "Executables")
+ target_link_libraries(reordercap ${reordercap_LIBS})
+ install(TARGETS reordercap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
+
if(BUILD_capinfos)
set(capinfos_LIBS
wiretap
+ wsutil
${ZLIB_LIBRARIES}
${GCRYPT_LIBRARIES}
- ${APPLE_COCOA_LIBRARY}
+ ${CMAKE_DL_LIBS}
)
set(capinfos_FILES
capinfos.c
add_executable(capinfos ${capinfos_FILES})
add_dependencies(capinfos svnversion)
set_target_properties(capinfos PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+ set_target_properties(capinfos PROPERTIES FOLDER "Executables")
target_link_libraries(capinfos ${capinfos_LIBS})
install(TARGETS capinfos RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
set(editcap_LIBS
wiretap
${ZLIB_LIBRARIES}
+ ${CMAKE_DL_LIBS}
)
set(editcap_FILES
editcap.c
- epan/crypt/md5.c
- epan/nstime.c
${WTAP_PLUGIN_SOURCES}
)
add_executable(editcap ${editcap_FILES})
add_dependencies(editcap svnversion)
set_target_properties(editcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+ set_target_properties(editcap PROPERTIES FOLDER "Executables")
target_link_libraries(editcap ${editcap_LIBS})
install(TARGETS editcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if(BUILD_dumpcap AND PCAP_FOUND)
set(dumpcap_LIBS
-# @INET_NTOP_LO@
wsutil
${PCAP_LIBRARIES}
${CAP_LIBRARIES}
${GLIB2_LIBRARIES}
${GTHREAD2_LIBRARIES}
${ZLIB_LIBRARIES}
- ${APPLE_COCOA_LIBRARY}
+ ${APPLE_CORE_FOUNDATION_LIBRARY}
+ ${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
${NL_LIBRARIES}
)
set(dumpcap_FILES
capture_opts.c
capture-pcap-util.c
capture_stop_conditions.c
+ cfutils.c
clopts_common.c
conditions.c
dumpcap.c
pcapio.c
ringbuffer.c
sync_pipe_write.c
- tempfile.c
version_info.c
ws80211_utils.c
- ${PLATFORM_SRC}
+ ${PLATFORM_CAPTURE_SRC}
)
add_executable(dumpcap ${dumpcap_FILES})
add_dependencies(dumpcap svnversion)
set_target_properties(dumpcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
+ set_target_properties(dumpcap PROPERTIES FOLDER "Executables")
target_link_libraries(dumpcap ${dumpcap_LIBS})
install(TARGETS dumpcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
- COMMAND ${PERL}
+ COMMAND ${PERL_EXECUTABLE}
${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl
${CMAKE_SOURCE_DIR}/doc/make-authors-short.pl
< ${CMAKE_SOURCE_DIR}/AUTHORS
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT
${CMAKE_BINARY_DIR}/wireshark.pod
- COMMAND ${PERL}
+ COMMAND ${PERL_EXECUTABLE}
${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl
${CMAKE_SOURCE_DIR}/doc/make-authors-format.pl
< ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
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/asn2deb 1 )
+pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/idl2deb 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/reordercap 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/text2pcap 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/tshark 1 )
-pod2manhtml( wireshark 1 )
+pod2manhtml( ${CMAKE_BINARY_DIR}/wireshark 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/wireshark-filter 4 )
add_custom_target(
dftest.html
dumpcap.html
editcap.html
+ asn2deb.html
+ idl2deb.html
idl2wrs.html
mergecap.html
randpkt.html
rawshark.html
+ reordercap.html
text2pcap.html
tshark.html
wireshark.html
wireshark-filter.html
)
+set_target_properties(auxiliary PROPERTIES FOLDER "Docs")
set(MAN1_FILES
${CMAKE_BINARY_DIR}/capinfos.1
${CMAKE_BINARY_DIR}/mergecap.1
${CMAKE_BINARY_DIR}/randpkt.1
${CMAKE_BINARY_DIR}/rawshark.1
+ ${CMAKE_BINARY_DIR}/reordercap.1
${CMAKE_BINARY_DIR}/text2pcap.1
${CMAKE_BINARY_DIR}/tshark.1
${CMAKE_BINARY_DIR}/wireshark.1
git.samba.org / metze / wireshark / wip.git / blobdiff