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()
# 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)
# Updated by make-version.pl
set(GIT_REVISION 0)
-set(PROJECT_MAJOR_VERSION 1)
-set(PROJECT_MINOR_VERSION 99)
-set(PROJECT_PATCH_VERSION 10)
+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 -fPIE (or -fPIC). -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)
set(WIRESHARK_EXTRA_COMPILER_COMMON_FLAGS
# The following are for C and C++
-Wpedantic
+ -Wno-variadic-macros
#
# Various code blocks this one.
#
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}
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
# -fwhopr
# -fwhole-program
)
+ # CMAKE_POSITION_INDEPENDENT_CODE is only supported starting with CMake
+ # 2.8.9. Do not add -pie automatically for older versions.
+ if(NOT CMAKE_VERSION VERSION_LESS "2.8.9")
+ set(WIRESHARK_LD_FLAGS ${WIRESHARK_LD_FLAGS}
+ -pie
+ )
+ endif()
endif()
include(CheckCLinkerFlag)
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(PACKAGELIST ${PACKAGELIST}
Qt5Core
Qt5LinguistTools
- Qt5MultimediaWidgets
+ Qt5Multimedia
Qt5PrintSupport
Qt5Widgets
)
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()
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)
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
+ #
+ # If it was added, we remove it, and then check whether it's
+ # necessary the same way we do for autotools, by checking
+ # whether we can compile and link a simple file with just
+ #
+ # #include <QtCore>
+ # int main() {}
+ #
+ # (Yes, check_XXX_source_compiles() should be renamed
+ # check_XXX_source_compiles_and_links().)
+ #
+ if ("${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}" MATCHES ".*-fPIC.*")
+ list(REMOVE_ITEM Qt5Widgets_EXECUTABLE_COMPILE_FLAGS "-fPIC")
+ set(CMAKE_REQUIRED_FLAGS ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS})
+ set(CMAKE_REQUIRED_INCLUDES ${Qt5Core_INCLUDE_DIRS})
+ set(CMAKE_REQUIRED_LIBS ${Qt5Core_LIBRARIES})
+ check_cxx_source_compiles(
+ "#include <QtCore>
+ int main() {}"
+ WORKS_WITHOUT_FPIC)
+ if (NOT WORKS_WITHOUT_FPIC)
+ #
+ # OK, it won't compile without -fPIC. Try adding it.
+ #
+ set(CMAKE_REQUIRED_FLAGS "-fPIC")
+ check_cxx_source_compiles(
+ "#include <QtCore>
+ int main() {}"
+ WORKS_WITH_FPIC)
+ if (NOT WORKS_WITH_FPIC)
+ #
+ # It won't build with -fPIC or without -fPIC,
+ # so we're hosed.
+ #
+ message(FATAL_ERROR "Couldn't compile Qt without -fPIC nor with -fPIC")
+ endif()
+
+ #
+ # It compiles with -fPIC, so add it back.
+ #
+ list(APPEND Qt5Widgets_EXECUTABLE_COMPILE_FLAGS "-fPIC")
+ endif()
+ set(CMAKE_REQUIRED_FLAGS "")
+ set(CMAKE_REQUIRED_INCLUDES "")
+ set(CMAKE_REQUIRED_LIBS "")
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_MULTIMEDIAWIDGETS_LIB 1)
+ set(QT_MULTIMEDIA_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)
#
image/wiretap.rc.in
image/wireshark.exe.manifest.in
packaging/macosx/Info.plist.in
+ packaging/macosx/osx-dmg.sh.in
+ packaging/macosx/Wireshark_package.pmdoc/index.xml.in
${CUSTOM_PLUGIN_IN_FILES}
ui/doxygen.cfg.in
ui/gtk/doxygen.cfg.in
$<$<CONFIG:Debug>:--debug>
$<$<NOT:$<CONFIG:Debug>>:--release>
--no-compiler-runtime
+ --verbose 10
"$<TARGET_FILE:wireshark>"
)
add_dependencies(copy_qt_dlls wireshark)
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 )
${androiddump_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}" "${CMAKE_BINARY_DIR}"
+ 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