if(WIN32)
find_package(PowerShell REQUIRED)
- if("${CMAKE_GENERATOR}" MATCHES "Win64")
+ if(${CMAKE_CL_64} OR "${CMAKE_GENERATOR}" MATCHES "Win64")
set(WIRESHARK_TARGET_PLATFORM win64)
elseif("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
set(WIRESHARK_TARGET_PLATFORM win32)
endif()
message(STATUS "Building for ${WIRESHARK_TARGET_PLATFORM} using ${CMAKE_GENERATOR}")
- # Determine where the 3rd party libraries will be
+ # Determine where the 3rd party libraries will be
if( DEFINED ENV{WIRESHARK_LIB_DIR} )
# The buildbots set WIRESHARK_LIB_DIR but not WIRESHARK_BASE_DIR.
file( TO_CMAKE_PATH "$ENV{WIRESHARK_LIB_DIR}" _PROJECT_LIB_DIR )
elseif( DEFINED ENV{WIRESHARK_BASE_DIR} )
file( TO_CMAKE_PATH "$ENV{WIRESHARK_BASE_DIR}" _WS_BASE_DIR )
set( _PROJECT_LIB_DIR "${_WS_BASE_DIR}/wireshark-${WIRESHARK_TARGET_PLATFORM}-libs" )
- else()
- # Don't know what to do
- message(FATAL_ERROR "Neither WIRESHARK_BASE_DIR or WIRESHARK_LIB_DIR are defined")
+ else()
+ # Don't know what to do
+ message(FATAL_ERROR "Neither WIRESHARK_BASE_DIR or WIRESHARK_LIB_DIR are defined")
endif()
# Download third-party libraries
elseif(MSVC10)
set(_vsversion_args "10")
else()
- message(FATAL_ERROR "Unsupported compiler ${CMAKE_C_COMPILER}")
+ message(FATAL_ERROR "Unsupported compiler ${CMAKE_C_COMPILER}")
endif()
# Is it possible to have a one-time, non-cached option in CMake? If
# so, we could add a "-DFORCE_WIN_SETUP" which passes -Force to
# win-setup.ps1.
execute_process(
- COMMAND ${POWERSHELL_COMMAND} "${_win_setup}" -Destination "${_ws_lib_dir}" -Platform ${WIRESHARK_TARGET_PLATFORM} -VSVersion ${_vsversion_args}
+ COMMAND ${POWERSHELL_COMMAND} "\"${_win_setup}\"" -Destination "${_ws_lib_dir}" -Platform ${WIRESHARK_TARGET_PLATFORM} -VSVersion ${_vsversion_args}
RESULT_VARIABLE _win_setup_failed
)
if (${_win_setup_failed})
endif()
# XXX Add a dependency on ${_ws_lib_dir}/current_tag.txt?
+
+ # Head off any attempts to use Cygwin's Python.
+ include(LocatePythonExecutable)
endif(WIN32)
include(UseCustomIncludes)
FORCE)
endif()
message(STATUS "Configuration types: ${CMAKE_CONFIGURATION_TYPES}")
-
-# Override optimization and other flags for make based generators
-foreach (_BT DEBUG RELEASE RELWITHDEBINFO SIZEREL)
- set( CMAKE_C_FLAGS_${_BT} "${CMAKE_C_FLAGS_${_BT}} ${CMAKE_C_FLAGS}" )
- set( CMAKE_CXX_FLAGS_${_BT} "${CMAKE_C_FLAGS_${_BT}} ${CMAKE_C_FLAGS}" )
-endforeach()
-
-message(STATUS "${CMAKE_BUILD_TYPE}: ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+string(TOUPPER "${CMAKE_BUILD_TYPE}" _build_type)
+message(STATUS "CMAKE_C_FLAGS_${_build_type}: ${CMAKE_C_FLAGS_${_build_type}}")
+message(STATUS "CMAKE_CXX_FLAGS_${_build_type}: ${CMAKE_CXX_FLAGS_${_build_type}}")
# Where to put executables and libraries in the build tree
# Note: Executables and libraries might end end up in a configuration
# Updated by make-version.pl
set(GIT_REVISION 0)
-set(PROJECT_MAJOR_VERSION 1)
-set(PROJECT_MINOR_VERSION 99)
-set(PROJECT_PATCH_VERSION 9)
+set(PROJECT_MAJOR_VERSION 2)
+set(PROJECT_MINOR_VERSION 1)
+set(PROJECT_PATCH_VERSION 0)
set(PROJECT_BUILD_VERSION ${GIT_REVISION})
set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}")
set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION}")
set( DUMPCAP_INSTALL_OPTION )
endif()
+# Always enable position-independent code when compiling, even for
+# executables, so you can build position-independent executables.
+# -pie is added below for non-MSVC.
+# Needed when either:
+# - Qt5_POSITION_INDEPENDENT_CODE is set and CMake < 2.8.11
+# - PIE is wanted (-pie) and you want to add -fPIC/-fPIE automatically.
+# This option only has an effect on CMake >= 2.8.9
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
if (MSVC10)
set(MSC_VER_REQUIRED 1600)
endif()
# FIXME: WINPCAP_VERSION cannot be determined from source or executable.
- set(WINPCAP_VERSION "unknown")
+ set(WINPCAP_VERSION "4_1_3")
add_definitions("/DWINPCAP_VERSION=${WINPCAP_VERSION}")
set(LOCAL_CFLAGS
# See http://msdn.microsoft.com/en-us/library/dn785163.aspx
set(LOCAL_CFLAGS ${LOCAL_CFLAGS} "/Zo")
elseif(MSVC14)
- # /Zo Enhanced debugging of optimised codem for VS2013 Update 3 and beyond,
- # Assume all VS2013 builds are at least Update 3.
- # See http://msdn.microsoft.com/en-us/library/dn785163.aspx
+ # /Zo Enhanced debugging of optimised code
+ # VS2015(MSVC14): On by default when /Zi or /Z7 used.
set(LOCAL_CFLAGS ${LOCAL_CFLAGS} "/Zo")
endif()
-Wformat-security
-fwrapv
-fno-strict-overflow
- -fno-delete-null-pointer-checks
- -fsanitize=undefined # compile and runtime checks
- # -fsanitize=float-divide-by-zero
- # -fsanitize=float-cast-overflow
- # -fsanitize=address
- # -fno-sanitize-recover # Abort during runtime
-Wvla
-Waddress
-Wattributes
-Wignored-qualifiers
-Wpragmas
-Wno-overlength-strings
- -Wwrite-strings
-Wno-long-long
-Wheader-guard
-Wunused-const-variable
# The following are for C and C++
-Wpedantic
#
+ # As we use variadic macros, we don't want warnings
+ # about them, even with -Wpedantic.
+ #
+ -Wno-variadic-macros
+ #
# Various code blocks this one.
#
-Woverflow
# (about glib library not using Doxygen)
#
-Wdocumentation
+ #
+ # No longer supported by El Capitan clang on C++
+ #
+ -fno-delete-null-pointer-checks
)
set(WIRESHARK_EXTRA_COMPILER_C_ONLY_FLAGS
if(CMAKE_C_COMPILER_ID MATCHES "Clang")
set(WIRESHARK_COMMON_FLAGS ${WIRESHARK_COMMON_FLAGS}
- #-fcolor-diagnostics
+ # avoid "argument unused during compilation" warnings
+ # (for example, when getting the -gsplit-dwarf option or
+ # when combining -fwrapv with -fno-strict-overflow)
+ -Qunused-arguments
)
- # ccache + clang++ can result in "argument unused during
- # compilation" warnings.
set(WIRESHARK_CPP_ONLY_FLAGS ${WIRESHARK_CPP_ONLY_FLAGS}
- -Qunused-arguments
)
else()
set(WIRESHARK_COMMON_FLAGS ${WIRESHARK_COMMON_FLAGS}
# and no yet all leak is fixed...
# use ASAN_OPTIONS=detect_leaks=0 to disable detect_leaks
-fsanitize=address
+ -fsanitize=undefined # compile and runtime checks
+ # -fsanitize=float-divide-by-zero
+ # -fsanitize=float-cast-overflow
+ # -fno-sanitize-recover # Abort during runtime
)
if(ENABLE_ASAN)
include(CheckCCompilerFlag)
include(CheckCXXCompilerFlag)
-if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_COMPILER_WARNINGS)
- check_c_compiler_flag(-Werror WERROR)
+if(ENABLE_STATIC)
+ set(BUILD_SHARED_LIBS 0)
+ set(LINK_MODE_LIB STATIC)
+ set(LINK_MODE_MODULE STATIC)
else()
- set(WERROR FALSE)
+ set(BUILD_SHARED_LIBS 1)
+ set(LINK_MODE_LIB SHARED)
+ set(LINK_MODE_MODULE MODULE)
endif()
# Sigh: Have to use THIS_FLAG instead of ${F} for some reason
endforeach()
set(CMAKE_CXX_FLAGS "${ADDED_CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
+if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_COMPILER_WARNINGS)
+ if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
+ set(WERROR_COMMON_FLAGS "/WX")
+ set(NO_ERROR_DEPRECATED_DECLARATIONS_COMPILE_FLAGS)
+ else()
+ check_c_compiler_flag(-Werror WERROR)
+ if (WERROR)
+ set(WERROR_COMMON_FLAGS "-Werror")
+ set(NO_ERROR_DEPRECATED_DECLARATIONS_COMPILE_FLAGS "-Wno-error=deprecated-declarations")
+ endif()
+ endif()
+else()
+ set(WERROR_COMMON_FLAGS FALSE)
+endif()
+
#
# Try to have the compiler default to hiding symbols, so that only
# symbols explicitly exported with WS_DLL_PUBLIC will be visible
#
if( NOT CMAKE_C_COMPILER_ID MATCHES "MSVC")
#
- # Try the GCC-and-copatible -fvisibility-hidden first.
+ # Try the GCC-and-compatible -fvisibility-hidden first.
#
check_c_compiler_flag(-fvisibility=hidden FVHIDDEN)
if(FVHIDDEN)
set (C_UNUSED "" )
endif()
-
-if(NOT CMAKE_C_COMPILER_ID MATCHES "MSVC")
- set(WIRESHARK_LD_FLAGS
- -Wl,--as-needed
- # -flto
- # -fwhopr
- # -fwhole-program
+set(WIRESHARK_LD_FLAGS
+ -Wl,--as-needed
+ # -flto
+ # -fwhopr
+ # -fwhole-program
+)
+# CMAKE_POSITION_INDEPENDENT_CODE is only supported starting with CMake
+# 2.8.9. Do not add -pie automatically for older versions.
+#
+# XXX - are there other compilers that don't support -pie? It's
+# not as if the only platforms we support are Windows and Linux....
+#
+if(NOT CMAKE_VERSION VERSION_LESS "2.8.9")
+ set(WIRESHARK_LD_FLAGS ${WIRESHARK_LD_FLAGS}
+ -pie
)
endif()
math(EXPR _C "${_C} + 1")
endforeach()
-if(ENABLE_STATIC)
- set(BUILD_SHARED_LIBS 0)
- set(LINK_MODE_LIB STATIC)
- set(LINK_MODE_MODULE STATIC)
-else()
- set(BUILD_SHARED_LIBS 1)
- set(LINK_MODE_LIB SHARED)
- 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
# - set HAVE_XXX
#The minimum package list
-set(PACKAGELIST Gettext M GLIB2 GMODULE2 GTHREAD2 LEX YACC Perl SED SH PythonInterp)
+set(PACKAGELIST Gettext M Git GLIB2 GMODULE2 GTHREAD2 LEX YACC Perl SED SH PythonInterp)
set(LEX_REQUIRED TRUE)
set(GLIB2_REQUIRED TRUE)
set(GLIB2_FIND_REQUIRED TRUE)
set(PACKAGELIST ${PACKAGELIST} HtmlViewer)
+set(PACKAGELIST ${PACKAGELIST} LIBSSH)
+set(LIBSSH_OPTIONS "0.6")
+
if(ENABLE_PCAP)
set(PACKAGELIST ${PACKAGELIST} PCAP)
endif()
set(PACKAGELIST ${PACKAGELIST}
Qt5Core
Qt5LinguistTools
- Qt5MultimediaWidgets
+ Qt5Multimedia
Qt5PrintSupport
+ Qt5Svg
Qt5Widgets
)
if (APPLE)
set(QT_VERSION 5)
else()
set(PACKAGELIST ${PACKAGELIST} Qt4)
- # set(Qt4_OPTIONS 4.7.1 REQUIRED QtCore QtGui)
+ set(Qt4_OPTIONS 4.7.1 REQUIRED QtCore QtGui)
set(QT_VERSION 4)
endif()
endif()
# GNU crypto
if(ENABLE_GCRYPT)
set(PACKAGELIST ${PACKAGELIST} GCRYPT)
+ # Minimum version needed.
+ set(GCRYPT_OPTIONS "1.4.2")
endif()
# GNU SSL/TLS support
if(ENABLE_GNUTLS)
set(PACKAGELIST ${PACKAGELIST} GNUTLS)
+ # Minimum version needed.
+ set(GNUTLS_OPTIONS "2.12.0")
endif()
# Kerberos
set(PACKAGELIST ${PACKAGELIST} KERBEROS)
endif()
-# Portable audio
+# Portable audio (GTK+ only)
if(ENABLE_PORTAUDIO AND BUILD_wireshark_gtk)
set(PACKAGELIST ${PACKAGELIST} PORTAUDIO)
endif()
if (WIN32)
# On Windows we build our own version of zlib, so add the paths
set(ZLIB_SRC_DIR "${_PROJECT_LIB_DIR}/zlib-1.2.8-ws")
+ set(SKIP_INSTALL_ALL True) # We copy the DLL ourselves.
add_subdirectory("${ZLIB_SRC_DIR}" "${CMAKE_BINARY_DIR}/zlib")
+ unset(SKIP_INSTALL_ALL)
set(ZLIB_INCLUDE_DIR "${ZLIB_SRC_DIR}" "${CMAKE_BINARY_DIR}/zlib")
set(ZLIB_LIBRARY zlib)
set(ZLIB_DLL "zlib1.dll")
set(PROGLIST)
-#Sort the package list
+# Sort the package list
list(SORT PACKAGELIST)
message(STATUS "Packagelist: ${PACKAGELIST}")
-#Let's loop the package list
+# Let's loop the package list
foreach(PACKAGE ${PACKAGELIST})
if(${PACKAGE} STREQUAL "Qt4")
set(PACKAGE_VAR "QT")
endif()
if(HAVE_LIBKERBEROS)
set(HAVE_KERBEROS 1)
- # HAVE_HEIMDAL_KERBEROS
- set(HAVE_MIT_KERBEROS 1)
- set(HAVE_KEYTYPE_ARCFOUR_56 1)
endif()
if(HAVE_LIBGEOIP)
set(HAVE_GEOIP 1)
endif()
+if(LIBSSH_FOUND)
+ set(HAVE_LIBSSH 1)
+endif()
if(HAVE_LIBCARES)
set(HAVE_C_ARES 1)
endif()
include_directories(BEFORE ${ZLIB_INCLUDE_DIRS})
endif()
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)
+ #
+ # Qt5CoreConfigExtras.cmake in Qt 5.5.0 sets -fPIC unconditionally:
+ #
+ # https://bugreports.qt.io/browse/QTBUG-47942
+ #
+ # There's a fix in Gerrit for that:
+ #
+ # https://codereview.qt-project.org/#/c/139645/
+ #
+ # Do the same check as that fix does and, if the check says we
+ # should *not* add -fPIC, remove it.
+ #
+ # XXX - if that check gets changed in the future, we'll have to
+ # detect that and change it.
+ #
+ if (CMAKE_VERSION VERSION_LESS 2.8.12
+ AND (CMAKE_CXX_COMPILER_ID STREQUAL \"GNU\"
+ AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0))
+ #
+ # Yes, it should have been; leave it there.
+ #
+ else()
+ #
+ # No, it shouldn't have been; remove it.
+ #
+ list(REMOVE_ITEM Qt5Widgets_EXECUTABLE_COMPILE_FLAGS "-fPIC")
endif()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
set (QT_FOUND ON)
set (QT_LIBRARIES ${Qt5Widgets_LIBRARIES} ${Qt5PrintSupport_LIBRARIES})
- if(Qt5MultimediaWidgets_FOUND)
- set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MultimediaWidgets_LIBRARIES})
+ if(Qt5Multimedia_FOUND)
+ set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Multimedia_LIBRARIES})
+ # That's the name autofoo uses
+ set(QT_MULTIMEDIA_LIB 1)
+ endif()
+ if(Qt5Svg_FOUND)
+ set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Svg_LIBRARIES})
# That's the name autofoo uses
- set(QT_MULTIMEDIAWIDGETS_LIB 1)
+ set(QT_SVG_LIB 1)
endif()
if(Qt5MacExtras_FOUND)
set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES})
include_directories(${QT_INCLUDE_DIR})
message(STATUS "Qt includes: ${QT_INCLUDE_DIR}")
message(STATUS "Qt libs: ${QT_LIBRARIES}")
+ if(QT_QTMULTIMEDIA_FOUND)
+ include_directories(${QT_QTMULTIMEDIA_INCLUDE_DIR})
+ message(STATUS "QtMultimedia includes: ${QT_INCLUDE_DIR}")
+ set (QT_LIBRARIES ${QT_LIBRARIES} ${QT_QTMULTIMEDIA_LIBRARY})
+ message(STATUS "QtMultimedia libs: ${QT_QTMULTIMEDIA_LIBRARY}")
+ # That's the name autofoo uses
+ set(QT_MULTIMEDIA_LIB 1)
+ endif()
endif()
message(STATUS "C-Flags: ${CMAKE_C_FLAGS}")
message(STATUS "CXX-Flags: ${CMAKE_CXX_FLAGS}")
+message(STATUS "Warnings as errors: ${WERROR_COMMON_FLAGS}")
if(APPLE)
#
add_subdirectory( wsutil )
if(NOT WIN32)
- add_custom_target(dumpabi DEPENDS dumpabi-libwireshark dumpabi-libwiretap dumpabi-libwsutil color.h)
+ add_custom_target(dumpabi DEPENDS dumpabi-libwireshark dumpabi-libwiretap dumpabi-libwsutil)
endif()
if(ENABLE_ECHLD)
get_target_property(_libwireshark_location epan LOCATION)
get_filename_component(_datafile_dir "${_libwireshark_location}" PATH)
endif()
-set (DATAFILE_DIR ${_datafile_dir} CACHE INTERNAL "Build time data file location.")
-if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR})
- set(ABSOLUTE_CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
-else()
- set(ABSOLUTE_CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-endif()
+set(DATAFILE_DIR ${_datafile_dir} CACHE INTERNAL "Build time data file location.")
if(ENABLE_EXTCAP)
+ # Target platform locations
+ # UNIX, Linux, non-bundled OS X: $DESTDIR/lib/wireshark/extcap
+ # Windows: $DESTDIR/extcap
+ # OS X app bundle: Wireshark.app/Contents/Resources/share/wireshark/extcap
set(HAVE_EXTCAP 1)
- set(EXTCAP_DIR "${ABSOLUTE_CMAKE_INSTALL_LIBDIR}/${CPACK_PACKAGE_NAME}/extcap/")
+ if (WIN32)
+ set(EXTCAP_DIR "extcap")
+ else ()
+ set(EXTCAP_DIR "${CMAKE_INSTALL_LIBDIR}/${CPACK_PACKAGE_NAME}/extcap")
+ endif()
+endif()
+
+if(LIBSSH_FOUND)
+ SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBSSH_LIBRARIES})
+ CHECK_FUNCTION_EXISTS(ssh_userauth_agent LIBSSH_USERAUTH_AGENT_FOUND)
+ if(LIBSSH_USERAUTH_AGENT_FOUND)
+ set(HAVE_SSH_USERAUTH_AGENT 1)
+ endif()
endif()
# Location of our plugins. PLUGIN_DIRECTORY should allow running
# from the build directory similar to DATAFILE_DIR above.
if(ENABLE_PLUGINS)
+ # Target platform locations
+ # UNIX, Linux, non-bundled OS X: $DESTDIR/lib/wireshark/plugins/$VERSION
+ # Windows: $DESTDIR/wireshark/plubins/$VERSION
+ # OS X app bundle: Wireshark.app/Contents/PlugIns/wireshark
set(HAVE_PLUGINS 1)
add_custom_target(plugins)
set_target_properties(plugins PROPERTIES FOLDER "Plugins")
- set(PLUGIN_INSTALL_DIR "${ABSOLUTE_CMAKE_INSTALL_LIBDIR}/${CPACK_PACKAGE_NAME}/plugins/${CPACK_PACKAGE_VERSION}")
+ if (WIN32)
+ set(PLUGIN_INSTALL_DIR "plugins/${CPACK_PACKAGE_VERSION}")
+ else ()
+ set(PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/${CPACK_PACKAGE_NAME}/plugins/${CPACK_PACKAGE_VERSION}")
+ endif()
set(PLUGIN_SRC_DIRS
plugins/docsis
plugins/ethercat
set(WS_MSVC_NORETURN " ")
endif()
+if (${GIT_EXECUTABLE})
+ set(GIT_BIN_PARAM "--git-bin ${GIT_EXECUTABLE}")
+endif()
set( VERSION ${PROJECT_VERSION} )
execute_process(
COMMAND ${PERL_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl
- --print-vcs
+ --print-vcs ${GIT_BIN_PARAM}
${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE VERSION_H_CONTENT
)
configure_file(${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_BINARY_DIR}/version.h)
#set_target_properties(${CMAKE_BINARY_DIR}/version.h PROPERTIES FOLDER "Auxiliary")
+set( prefix "${CMAKE_INSTALL_PREFIX}" )
+set( exec_prefix "\${prefix}" )
+set( libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}" )
+set( includedir "\${prefix}/include" )
+set( plugindir "\${libdir}/wireshark/plugins/${CPACK_PACKAGE_VERSION}" )
+
set(ICON_PATH "${CMAKE_SOURCE_DIR}/image/")
set( IN_FILES
adns_dll.rc
image/tfshark.rc.in
image/editcap.rc.in
image/captype.rc.in
+ image/libwscodecs.rc.in
image/libwsutil.rc.in
image/wiretap.rc.in
image/wireshark.exe.manifest.in
packaging/macosx/Info.plist.in
- ${CUSTOM_PLUGIN_IN_FILES}
+ packaging/macosx/osx-dmg.sh.in
+ packaging/macosx/Wireshark_package.pmdoc/index.xml.in
ui/doxygen.cfg.in
ui/gtk/doxygen.cfg.in
ui/qt/doxygen.cfg.in
include(FeatureSummary)
#SET_FEATURE_INFO(NAME DESCRIPTION [URL [COMMENT] ])
SET_FEATURE_INFO(SBC "SBC Codec for Bluetooth A2DP stream playing" "www: http://git.kernel.org/cgit/bluetooth/sbc.git" )
+SET_FEATURE_INFO(LIBSSH "libssh is library for ssh connections and it is needed to build sshdump" "www: https://www.libssh.org/get-it/" )
FEATURE_SUMMARY(WHAT ALL)
set(INSTALL_FILES
${CMAKE_BINARY_DIR}/androiddump.html
+ ${CMAKE_BINARY_DIR}/sshdump.html
${CMAKE_BINARY_DIR}/AUTHORS-SHORT
${CMAKE_BINARY_DIR}/capinfos.html
${CMAKE_BINARY_DIR}/captype.html
${CMAKE_BINARY_DIR}/mergecap.html
pdml2html.xsl
${CMAKE_BINARY_DIR}/randpkt.html
+ ${CMAKE_BINARY_DIR}/randpktdump.html
${CMAKE_BINARY_DIR}/rawshark.html
${CMAKE_BINARY_DIR}/reordercap.html
services
${CMAKE_BINARY_DIR}/idl2wrs.1
${CMAKE_BINARY_DIR}/mergecap.1
${CMAKE_BINARY_DIR}/randpkt.1
+ ${CMAKE_BINARY_DIR}/androiddump.1
${CMAKE_BINARY_DIR}/rawshark.1
${CMAKE_BINARY_DIR}/reordercap.1
+ ${CMAKE_BINARY_DIR}/sshdump.1
${CMAKE_BINARY_DIR}/text2pcap.1
${CMAKE_BINARY_DIR}/tshark.1
${CMAKE_BINARY_DIR}/wireshark.1
"${_dll_output_dir}"
)
endif(GEOIP_FOUND)
+ if (LIBSSH_FOUND)
+ add_custom_command(TARGET copy_cli_dlls PRE_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ "${LIBSSH_DLL_DIR}/${LIBSSH_DLL}"
+ "${_dll_output_dir}"
+ )
+ endif(LIBSSH_FOUND)
if(GCRYPT_FOUND)
foreach( _dll ${GCRYPT_DLLS} )
add_custom_command(TARGET copy_cli_dlls PRE_BUILD
endif()
endif(WIN32)
-# Copy ${INSTALL_FILES} and ${INSTALL_DIRS} to ${DATAFILE_DIR}
-add_custom_target(copy_data_files ALL DEPENDS ${INSTALL_FILES})
-set_target_properties(copy_data_files PROPERTIES FOLDER "Copy Tasks")
-add_dependencies(copy_data_files html_docs)
-if(ENABLE_APPLICATION_BUNDLE)
- add_custom_command(TARGET copy_data_files PRE_BUILD
- COMMAND ${CMAKE_COMMAND} -E make_directory "${DATAFILE_DIR}"
- )
-endif()
+# List of extra dependencies for the "copy_data_files" target
+set(copy_data_files_depends)
+
+# glob patterns relative to the source directory that should be copied to
+# ${DATAFILE_DIR} (including directory prefixes)
+set(DATA_FILES_SRC
+ "help/toc"
+)
if(WIN32)
foreach(_text_file ${TEXTIFY_FILES})
foreach(_install_file ${INSTALL_FILES})
get_filename_component(_install_basename "${_install_file}" NAME)
- add_custom_command(TARGET copy_data_files POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ set(_output_file "${DATAFILE_DIR}/${_install_basename}")
+ add_custom_command(OUTPUT "${_output_file}"
+ COMMAND ${CMAKE_COMMAND} -E copy
"${_install_file}"
- "${DATAFILE_DIR}/${_install_basename}"
+ "${_output_file}"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ DEPENDS
+ html_docs
+ "${_install_file}"
)
+ list(APPEND copy_data_files_depends "${_output_file}")
endforeach()
if(ENABLE_EXTCAP)
- add_custom_command(TARGET copy_data_files PRE_BUILD
+ # Ensure "run/extcap" exists
+ add_custom_command(OUTPUT "${DATAFILE_DIR}/extcap"
COMMAND ${CMAKE_COMMAND} -E make_directory
"${DATAFILE_DIR}/extcap"
)
+ list(APPEND copy_data_files_depends "${DATAFILE_DIR}/extcap")
endif()
-add_custom_command(TARGET copy_data_files PRE_BUILD
- COMMAND ${CMAKE_COMMAND} -E make_directory
- "${DATAFILE_DIR}/help"
-)
-add_custom_command(TARGET copy_data_files PRE_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
- "${CMAKE_SOURCE_DIR}/help/toc"
- "${DATAFILE_DIR}/help/toc"
+set(_help_files
+ help/capture_filters.txt
+ help/capturing.txt
+ help/display_filters.txt
+ help/getting_started.txt
+ help/overview.txt
)
if(WIN32)
- file(TO_NATIVE_PATH ${DATAFILE_DIR}/help _help_dest_dir)
- add_custom_command(TARGET copy_data_files PRE_BUILD
- COMMAND ${POWERSHELL_COMMAND} "${CMAKE_SOURCE_DIR}/tools/textify.ps1"
- -Destination ${_help_dest_dir}
- ${CMAKE_SOURCE_DIR}/help/*.txt
- )
-else()
- file(GLOB _help_files
- "${CMAKE_SOURCE_DIR}/help/*.txt"
- )
- foreach(_help_file ${_help_files})
- add_custom_command(TARGET copy_data_files PRE_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
- "${_help_file}"
- "${DATAFILE_DIR}/help/"
+ file(TO_NATIVE_PATH "${DATAFILE_DIR}/help" _help_dest_dir)
+ foreach(_help_file IN LISTS _help_files)
+ add_custom_command(OUTPUT "${DATAFILE_DIR}/${_help_file}"
+ COMMAND ${CMAKE_COMMAND} -E make_directory "${DATAFILE_DIR}/help"
+ COMMAND ${POWERSHELL_COMMAND} "${CMAKE_SOURCE_DIR}/tools/textify.ps1"
+ -Destination "${_help_dest_dir}"
+ "${CMAKE_SOURCE_DIR}/${_help_file}"
+ DEPENDS
+ "${CMAKE_SOURCE_DIR}/${_help_file}"
)
+ list(APPEND copy_data_files_depends "${DATAFILE_DIR}/${_help_file}")
endforeach()
+else()
+ list(APPEND DATA_FILES_SRC ${_help_files})
endif(WIN32)
-add_custom_command(TARGET copy_data_files PRE_BUILD
+
+# Create help/faq.txt when missing
+add_custom_command(OUTPUT "${DATAFILE_DIR}/help/faq.txt"
+ COMMAND ${CMAKE_COMMAND} -E make_directory "${DATAFILE_DIR}/help"
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/help/faq.py -b > faq.tmp.html
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/html2text.py
faq.tmp.html > "${DATAFILE_DIR}/help/faq.txt"
COMMAND ${CMAKE_COMMAND} -E remove faq.tmp.html
+ DEPENDS
+ "${CMAKE_SOURCE_DIR}/help/faq.py"
+ "${CMAKE_SOURCE_DIR}/tools/html2text.py"
)
-
-if(LUA_FOUND)
- add_custom_command(TARGET copy_data_files PRE_BUILD
- COMMAND ${CMAKE_COMMAND} -E make_directory
- "${DATAFILE_DIR}/lua"
- )
- add_custom_command(TARGET copy_data_files PRE_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
- "${CMAKE_BINARY_DIR}/epan/wslua/init.lua"
- "${DATAFILE_DIR}"
- )
- add_custom_command(TARGET copy_data_files PRE_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
- "${CMAKE_SOURCE_DIR}/epan/wslua/console.lua"
- "${DATAFILE_DIR}"
- )
- add_custom_command(TARGET copy_data_files PRE_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
- "${CMAKE_SOURCE_DIR}/epan/wslua/dtd_gen.lua"
- "${DATAFILE_DIR}"
- )
- add_dependencies(copy_data_files wsluaauxiliary)
-endif(LUA_FOUND)
+list(APPEND copy_data_files_depends "${DATAFILE_DIR}/help/faq.txt")
+
+# Install LUA files in staging directory such that LUA can used when Wireshark
+# is ran from the build directory. For install targets, see
+# epan/wslua/CMakeLists.txt
+if(LUA_FOUND AND ENABLE_LUA)
+ set(_lua_files
+ "${CMAKE_BINARY_DIR}/epan/wslua/init.lua"
+ "${CMAKE_SOURCE_DIR}/epan/wslua/console.lua"
+ "${CMAKE_SOURCE_DIR}/epan/wslua/dtd_gen.lua"
+ )
+ foreach(_lua_file ${_lua_files})
+ get_filename_component(_lua_filename "${_lua_file}" NAME)
+ list(APPEND copy_data_files_depends
+ "${DATAFILE_DIR}/${_lua_filename}")
+ add_custom_command(OUTPUT "${DATAFILE_DIR}/${_lua_filename}"
+ COMMAND ${CMAKE_COMMAND} -E copy
+ "${_lua_file}"
+ "${DATAFILE_DIR}/${_lua_filename}"
+ DEPENDS
+ wsluaauxiliary
+ "${_lua_file}"
+ )
+ endforeach()
+endif(LUA_FOUND AND ENABLE_LUA)
# doc/*.html handled elsewhere.
-add_custom_command(TARGET copy_data_files PRE_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_directory
- "${CMAKE_SOURCE_DIR}/dtds"
- "${DATAFILE_DIR}/dtds"
-)
-# Skipping asn1 default.tt
-add_custom_command(TARGET copy_data_files PRE_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_directory
- "${CMAKE_SOURCE_DIR}/radius"
- "${DATAFILE_DIR}/radius"
-)
-add_custom_command(TARGET copy_data_files PRE_BUILD
- COMMAND ${CMAKE_COMMAND} -E make_directory
- "${DATAFILE_DIR}/diameter"
-)
-file(GLOB _diameter_files
- "${CMAKE_SOURCE_DIR}/diameter/*.dtd"
- "${CMAKE_SOURCE_DIR}/diameter/*.xml"
+
+# TODO shouldn't this use full (relative) paths instead of glob patterns?
+list(APPEND DATA_FILES_SRC
+ "dtds/*.dtd"
+
+ "radius/README.radius_dictionary"
+ "radius/custom.includes"
+ "radius/dictionary"
+ "radius/dictionary.*"
+
+ "diameter/*.dtd"
+ "diameter/*.xml"
+ "profiles/*/*"
+ "tpncp/tpncp.dat"
+ "wimaxasncp/*.dtd"
+ "wimaxasncp/*.xml"
)
-foreach(_diameter_file ${_diameter_files})
- add_custom_command(TARGET copy_data_files PRE_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
- "${_diameter_file}"
- "${DATAFILE_DIR}/diameter/"
- )
+
+# Copy all paths from the source tree to the data directory. Directories are
+# automatically created if missing as the filename is given.
+file(GLOB _data_files RELATIVE "${CMAKE_SOURCE_DIR}" ${DATA_FILES_SRC})
+foreach(_data_file ${_data_files})
+ add_custom_command(OUTPUT "${DATAFILE_DIR}/${_data_file}"
+ COMMAND ${CMAKE_COMMAND} -E copy
+ "${CMAKE_SOURCE_DIR}/${_data_file}"
+ "${DATAFILE_DIR}/${_data_file}"
+ DEPENDS
+ "${CMAKE_SOURCE_DIR}/${_data_file}"
+ )
+ list(APPEND copy_data_files_depends "${DATAFILE_DIR}/${_data_file}")
endforeach()
-add_custom_command(TARGET copy_data_files PRE_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_directory
- "${CMAKE_SOURCE_DIR}/profiles"
- "${DATAFILE_DIR}/profiles"
-)
-add_custom_command(TARGET copy_data_files PRE_BUILD
- COMMAND ${CMAKE_COMMAND} -E make_directory
- "${DATAFILE_DIR}/tpncp"
-)
-add_custom_command(TARGET copy_data_files PRE_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
- "${CMAKE_SOURCE_DIR}/tpncp/tpncp.dat"
- "${DATAFILE_DIR}/tpncp/tpncp.dat"
-)
-add_custom_command(TARGET copy_data_files PRE_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_directory
- "${CMAKE_SOURCE_DIR}/wimaxasncp"
- "${DATAFILE_DIR}/wimaxasncp"
-)
+
+# Copy files including ${INSTALL_FILES} and ${INSTALL_DIRS} to ${DATAFILE_DIR}
+add_custom_target(copy_data_files ALL DEPENDS ${copy_data_files_depends})
+set_target_properties(copy_data_files PROPERTIES FOLDER "Copy Tasks")
if( (BUILD_wireshark AND QT_FOUND) OR (BUILD_wireshark_gtk AND GTK_FOUND) )
set(WIRESHARK_SRC
capture_info.c
capture_opts.c
- color_filters.c
file.c
fileset.c
summary.c
caputils
${QT_LIBRARIES}
${GTHREAD2_LIBRARIES}
- codecs
+ wscodecs
${LIBEPAN_LIBS}
${APPLE_APPLICATION_SERVICES_LIBRARY}
${APPLE_CORE_FOUNDATION_LIBRARY}
$<$<CONFIG:Debug>:--debug>
$<$<NOT:$<CONFIG:Debug>>:--release>
--no-compiler-runtime
+ --verbose 10
"$<TARGET_FILE:wireshark>"
)
add_dependencies(copy_qt_dlls wireshark)
endmacro()
macro(set_extcap_executable_properties _executable)
- set_target_properties(androiddump PROPERTIES FOLDER "Executables/Extcaps")
+ set_target_properties(${_executable} PROPERTIES FOLDER "Executables/Extcaps")
set(PROGLIST ${PROGLIST} ${_executable})
${GTK2_LIBRARIES}
${GTK3_LIBRARIES}
${GTHREAD2_LIBRARIES}
- codecs
+ wscodecs
${PORTAUDIO_LIBRARIES}
${LIBEPAN_LIBS}
${APPLE_APPLICATION_SERVICES_LIBRARY}
)
set(randpkt_FILES
randpkt.c
+ randpkt-core.c
)
add_executable(randpkt ${randpkt_FILES})
set_extra_executable_properties(randpkt "Executables")
endif()
if (WIN32)
+ find_package( MSVC_REDIST )
+
# Must come after executable targets are defined.
find_package( NSIS )
install(TARGETS androiddump RUNTIME DESTINATION ${EXTCAP_DIR})
endif()
+if(BUILD_sshdump AND LIBSSH_FOUND)
+ set(sshdump_LIBS
+ ${GLIB2_LIBRARIES}
+ ${CMAKE_DL_LIBS}
+ ${LIBSSH_LIBRARIES}
+ )
+ if (WIN32)
+ set(sshdump_LIBS wsutil ${sshdump_LIBS})
+ endif()
+ set(sshdump_FILES
+ extcap/sshdump.c
+ )
+
+ add_executable(sshdump WIN32 ${sshdump_FILES})
+ set_extcap_executable_properties(sshdump)
+ target_link_libraries(sshdump ${sshdump_LIBS})
+ target_include_directories(sshdump PUBLIC ${LIBSSH_INCLUDE_DIR})
+ install(TARGETS sshdump RUNTIME DESTINATION ${EXTCAP_DIR})
+elseif (BUILD_sshdump)
+ #message( WARNING "Cannot find libssh, cannot build sshdump" )
+endif()
+
+if(BUILD_randpktdump)
+ set(randpktdump_LIBS
+ wiretap
+ ${GLIB2_LIBRARIES}
+ ${CMAKE_DL_LIBS}
+ )
+ set(randpktdump_FILES
+ extcap/randpktdump.c
+ randpkt-core.c
+ )
+
+ add_executable(randpktdump WIN32 ${randpktdump_FILES})
+ # XXX Shouldn't we add wsutil to randpktdump_LIBS instead?
+ set_extcap_executable_properties(randpktdump)
+ target_link_libraries(randpktdump ${randpktdump_LIBS})
+ install(TARGETS randpktdump RUNTIME DESTINATION ${EXTCAP_DIR})
+endif()
+
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
COMMAND ${PERL_EXECUTABLE}
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/run"
)
add_dependencies(app_bundle ${PROGLIST})
+
+ add_custom_target(dmg_package_prep DEPENDS app_bundle)
+
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${CMAKE_BINARY_DIR}/packaging/macosx/PkgInfo
+ COMMAND ${CMAKE_COMMAND} -E echo APPLWshk > ${CMAKE_BINARY_DIR}/packaging/macosx/PkgInfo
+ )
+
+ ADD_CUSTOM_TARGET( dmg_package
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ "${PROJECT_SOURCE_DIR}/ipmap.html"
+ $<TARGET_FILE_DIR:wireshark>
+ COMMAND ${CMAKE_COMMAND} -E copy_directory
+ ${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF
+ ${CMAKE_BINARY_DIR}/run/ChmodBPF
+ COMMAND ${CMAKE_COMMAND} -E copy_directory
+ ${CMAKE_SOURCE_DIR}/packaging/macosx/Resources
+ ${CMAKE_BINARY_DIR}/run/Resources
+ COMMAND ${CMAKE_COMMAND} -E copy_directory
+ ${CMAKE_SOURCE_DIR}/packaging/macosx/Scripts
+ ${CMAKE_BINARY_DIR}/run/Scripts
+ COMMAND ${CMAKE_COMMAND} -E copy_directory
+ ${CMAKE_SOURCE_DIR}/packaging/macosx/utility-launcher
+ ${CMAKE_BINARY_DIR}/run/utility-launcher
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${CMAKE_SOURCE_DIR}/COPYING
+ ${CMAKE_BINARY_DIR}/run/COPYING.txt
+ COMMAND ${CMAKE_COMMAND} -E copy_directory
+ ${CMAKE_SOURCE_DIR}/packaging/macosx/Wireshark_package.pmdoc
+ ${CMAKE_BINARY_DIR}/run/Wireshark_package.pmdoc
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${CMAKE_BINARY_DIR}/packaging/macosx/Wireshark_package.pmdoc/index.xml
+ ${CMAKE_BINARY_DIR}/run/Wireshark_package.pmdoc/index.xml
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${CMAKE_SOURCE_DIR}/packaging/macosx/dmg_background.png
+ ${CMAKE_BINARY_DIR}/run/dmg_background.png
+ COMMAND bash -x ${CMAKE_BINARY_DIR}/packaging/macosx/osx-dmg.sh
+ --source-directory ${CMAKE_SOURCE_DIR}/packaging/macosx
+ # Unlike nsis_package_prep + nsis_package, we can add a direct
+ # dependency here.
+ DEPENDS dmg_package_prep
+ # We create Wireshark.app in "run". Do our work there.
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/run
+ )
+
endif()
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/androiddump 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/randpktdump 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/rawshark 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/reordercap 1 )
+pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/sshdump 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/text2pcap 1 )
pod2manhtml( ${CMAKE_SOURCE_DIR}/doc/tshark 1 )
pod2manhtml( ${CMAKE_BINARY_DIR}/wireshark 1 )
idl2wrs.html
mergecap.html
randpkt.html
+ randpktdump.html
rawshark.html
reordercap.html
+ sshdump.html
text2pcap.html
tshark.html
wireshark.html
${rawshark_FILES}
${dftest_FILES}
${randpkt_FILES}
+ ${randpktdump_FILES}
${text2pcap_CLEAN_FILES}
${mergecap_FILES}
${capinfos_FILES}
${editcap_FILES}
${dumpcap_FILES}
${androiddump_FILES}
+ ${sshdump_FILES}
)
-if (WERROR)
+if (WERROR_COMMON_FLAGS)
set_source_files_properties(
${CLEAN_FILES}
PROPERTIES
- COMPILE_FLAGS -Werror
+ COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
)
endif()
)
set_target_properties(test-programs PROPERTIES FOLDER "Tests")
+if (WIN32)
+ file (TO_NATIVE_PATH ${CMAKE_SOURCE_DIR}/tools/Get-HardenFlags.ps1 _win_harden_flags)
+ add_custom_target(hardening-check
+ COMMAND ${POWERSHELL_COMMAND} "${_win_harden_flags}" "${_dll_output_dir_win}"
+ DEPENDS ${PROGLIST}
+ COMMENT "Checking binaries for security features"
+ )
+ set_target_properties(hardening-check PROPERTIES FOLDER "Tests")
+else ()
+ find_program(HARDENING_CHECK_EXECUTABLE hardening-check
+ DOC "Path to the hardening-check utility."
+ )
+ if (NOT "${HARDENING_CHECK_EXECUTABLE}" STREQUAL "HARDENING_CHECK_EXECUTABLE-NOTFOUND")
+ foreach(_prog ${PROGLIST})
+ get_target_property(_prog_dir ${_prog} RUNTIME_OUTPUT_DIRECTORY)
+ if ("${_prog_dir}" STREQUAL "_prog_dir-NOTFOUND")
+ set(_prog_dir "${CMAKE_BINARY_DIR}/run")
+ endif()
+ set(_prog_paths ${_prog_paths} "${_prog_dir}/${_prog}")
+ endforeach()
+ add_custom_target(hardening-check
+ COMMAND ${HARDENING_CHECK_EXECUTABLE} ${_prog_paths}
+ DEPENDS ${PROGLIST}
+ COMMENT "Checking binaries for security features"
+ )
+ endif()
+endif()
#
# Editor modelines - http://www.wireshark.org/tools/modelines.html
git.samba.org / metze / wireshark / wip.git / blobdiff