osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
wireshark/CMakeLists.txt

4043 lines
132 KiB
CMake
Raw Normal View History

propset, add $Id: $ and copyright headers svn path=/trunk/; revision=19150
2006-09-05 09:50:45 +00:00
# CMakeLists.txt
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
spdx: more licenses converted. Change-Id: I3861061ec261e63b23621799e020e811ed78a343 Reviewed-on: https://code.wireshark.org/review/26333 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-06 14:31:02 +00:00
# SPDX-License-Identifier: GPL-2.0-or-later
propset, add $Id: $ and copyright headers svn path=/trunk/; revision=19150
2006-09-05 09:50:45 +00:00
#
CMake, GitLab CI: forcibly unset CMAKE_VERBOSE_MAKEFILE if requested. Forcibly unset the cached version of CMAKE_VERBOSE_MAKEFILE if the FORCE_CMAKE_NINJA_NON_VERBOSE environment variable is set, to make *extra* sure that we don't do a verbose build.
2021-02-16 21:23:46 +00:00
if(DEFINED ENV{FORCE_CMAKE_NINJA_NON_VERBOSE})
#
# Forcibly unset CMAKE_VERBOSE_MAKEFILE,
# to make *CERTAIN* that we don't do
# anything verbose here!
#
unset(CMAKE_VERBOSE_MAKEFILE CACHE)
endif()
propset, add $Id: $ and copyright headers svn path=/trunk/; revision=19150
2006-09-05 09:50:45 +00:00
CMake: call cmake_minimum_required before project cmake_minimum_required() MUST be called even before project(), otherwise some policies will not be correctly set. On the macOS build on Travis for example, CMP0025 was accidentally set to "OLD" which resulted in CMAKE_C_COMPILER_ID being reported as "Clang" instead of "AppleClang". Change-Id: I20065e621628cde24946edb519d719f527936d87 Reviewed-on: https://code.wireshark.org/review/30685 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-18 02:14:42 +00:00
if(WIN32)
CMake: Use glib debug dlls in Windows debug builds This prevents the mix of debug/release Universal CRT library in a Wireshark. Bug: 16030 Change-Id: I2961541824caf3bef0a08c72b242427b5406a9bd Reviewed-on: https://code.wireshark.org/review/34444 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-09-03 18:28:52 +00:00
# Needed for add_custom_command() WORKING_DIRECTORY generator expressions
cmake_minimum_required(VERSION 3.13)
CMake: call cmake_minimum_required before project cmake_minimum_required() MUST be called even before project(), otherwise some policies will not be correctly set. On the macOS build on Travis for example, CMP0025 was accidentally set to "OLD" which resulted in CMAKE_C_COMPILER_ID being reported as "Clang" instead of "AppleClang". Change-Id: I20065e621628cde24946edb519d719f527936d87 Reviewed-on: https://code.wireshark.org/review/30685 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-18 02:14:42 +00:00
else()
CMake: Bump minimum CMake version to 3.10 Linux distributions that have a version less than 3.10 are either almost at end of support (Debian Stretch), or will be supported by Wireshark 3.6 LTS (RHEL 7, SLES 12). The Windows minimum is already 3.13. Increasing the minimum required means that policies CMP0069 and CMP0071 are automatically set to NEW, and we can use VERSION_GREATER_EQUAL. Fix an error in the Qt version comparison; it's Qt 5.14 that first required macOS 10.13 High Sierra, not Qt 5.15.
2022-04-22 00:19:56 +00:00
cmake_minimum_required(VERSION 3.10)
CMake: Set CMake Policy CMP0071 to NEW This policy says: "Since version 3.10, CMake processes regular and GENERATED source files in AUTOMOC and AUTOUIC. In earlier CMake versions, only regular source files were processed. GENERATED source files were ignored silently." We are currently running AUTOMOC/RCC/UIC on too many files unnecessarily and that should be improved. CMake 3.20 introduced some changes related with this that broke the build (issue #17314) and need further investigation. Meanwhile setting this policy to NEW shouldn't break anything and silences some noisy CMake warnings.
2021-03-29 00:32:20 +00:00
endif()
CMake: Set policy CMP0074 Accept foo_ROOT CMake and environment variables to influence the search path for find_package(foo). See https://cmake.org/cmake/help/v3.15/policy/CMP0074.html Change-Id: Ifa70fbc37a9d7a6da15eda4474d08fe45a1724ad Reviewed-on: https://code.wireshark.org/review/34636 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-09-27 15:53:47 +00:00
if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW)
endif()
CMake: silence CMP0083 warning from future CMake 3.14 The current development version of CMake started emitting warnings due to the use of CMAKE_POSITION_INDEPENDENT_CODE without setting CMP0083. Change-Id: Id6747c00fea7a1d28e5ba900ba4578fe89f40f83 Reviewed-on: https://code.wireshark.org/review/31579 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-17 18:34:37 +00:00
if(POLICY CMP0083)
cmake_policy(SET CMP0083 NEW)
endif()
CMake: Fix DOCDIR on Unix User guides are installed to doc/Wireshark. Use doc/wireshark instead. Remove leftover variable CPACK_PACKAGE_NAME. Change-Id: I9a1d6bdc7d8f0b48c61e43679285d5ba83904a63 Reviewed-on: https://code.wireshark.org/review/31851 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-02-01 16:25:24 +00:00
if(WIN32)
set(_project_name Wireshark)
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
set(_log_project_name Logray)
CMake: Fix DOCDIR on Unix User guides are installed to doc/Wireshark. Use doc/wireshark instead. Remove leftover variable CPACK_PACKAGE_NAME. Change-Id: I9a1d6bdc7d8f0b48c61e43679285d5ba83904a63 Reviewed-on: https://code.wireshark.org/review/31851 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-02-01 16:25:24 +00:00
else()
set(_project_name wireshark)
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
set(_log_project_name logray)
CMake: Fix DOCDIR on Unix User guides are installed to doc/Wireshark. Use doc/wireshark instead. Remove leftover variable CPACK_PACKAGE_NAME. Change-Id: I9a1d6bdc7d8f0b48c61e43679285d5ba83904a63 Reviewed-on: https://code.wireshark.org/review/31851 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-02-01 16:25:24 +00:00
endif()
project(${_project_name} C CXX)
OK, as I haven't had any negative feedback, I'm adding my work to use cmake as a build system. It's in no way complete, I'd just like others to be able to participate in playing with cmake and to document what I'm doing. Please read the README.cmake for what can be done right now. svn path=/trunk/; revision=19149
2006-09-05 09:27:22 +00:00
tools: Port make-version.pl to Python
2022-07-11 14:44:23 +00:00
# Updated by tools/make-version.py
2.9 → 3.1. Change-Id: Iea6b55037bfb62d2e9b333148cbdc55fcd53dfa2 Reviewed-on: https://code.wireshark.org/review/31888 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-05 01:19:58 +00:00
set(PROJECT_MAJOR_VERSION 3)
Version: 3.5.1 → 3.7.0 [skip ci]
2021-10-07 21:12:35 +00:00
set(PROJECT_MINOR_VERSION 7)
Version: 3.7.1 → 3.7.2 [skip ci]
2022-06-27 19:09:43 +00:00
set(PROJECT_PATCH_VERSION 2)
CMake+tools: Clean up our build version variables. In the top-level CMakeLists.txt, fill in PROJECT_BUILD_VERSION directly. Clean up the WiX PRODUCT_VERSION variable.
2022-07-04 22:40:26 +00:00
set(PROJECT_BUILD_VERSION 0)
CMake: Move version declarations to the top of CMakeLists.txt. This lets me be more lazy during releases. Change-Id: Ie59e200f1f46282e9271f459c0bbf31dc74a59a7 Reviewed-on: https://code.wireshark.org/review/17450 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-01 22:09:12 +00:00
set(PROJECT_VERSION_EXTENSION "")
if(DEFINED ENV{WIRESHARK_VERSION_EXTRA})
set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}")
endif()
set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION}")
Packaging: Add a Logwolf NSIS config. Create Logwolf-specific copies of the various Wireshark NSIS config files and modify them to install and uninstall Logwolf. There are still a bunch of rough edges, but the installer works for a test capture I have here.
2022-04-27 21:38:38 +00:00
set(LOG_PROJECT_NAME ${_log_project_name})
set(LOG_PROJECT_MAJOR_VERSION 0)
set(LOG_PROJECT_MINOR_VERSION 8)
set(LOG_PROJECT_VERSION "${LOG_PROJECT_MAJOR_VERSION}.${LOG_PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION}")
Fix build with non-standard install prefix The variables BUILD_dumpcap and PCAP_FOUND are defined after the if condition, therefore wireshark is built with a relative RPATH and library loading for privileged processes fails with glibc. Move the definition of BUILD_dumpcap before it is used and drop the test for PCAP_FOUND. Move a comment to the proper line while at it. Change-Id: Ie151a3781898e712f9e324e9ef995022bbea40b6 Reviewed-on: https://code.wireshark.org/review/34564 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-09-17 18:07:54 +00:00
include( CMakeOptions.txt )
CMake: Use CMAKE_C_STANDARD to require C11 Related to #17768.
2021-12-14 23:47:30 +00:00
# We require minimum C11
set(CMAKE_C_STANDARD 11)
set(CMAKE_C_STANDARD_REQUIRED ON)
CMakeList: We require minimum c++11 Change-Id: I685901dac2e950678362b3b8759c22dceec39176 Reviewed-on: https://code.wireshark.org/review/33636 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-17 13:59:47 +00:00
# We require minimum C++11
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
CMake minor updates Fix up generation messages for Windows build Remove some superfluous Lua messages Change-Id: I405e7edfcb043fc842fe4f0cca8d23d5755527f9 Reviewed-on: https://code.wireshark.org/review/8138 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-20 15:36:06 +00:00
message(STATUS "Generating build using CMake ${CMAKE_VERSION}")
OK, so my last commit message was too optimistic - I was using an installed version of wsutil. dumpcap now really builds on Linux via cmake. svn path=/trunk/; revision=28754
2009-06-16 04:12:30 +00:00
CMake: Fix setting default build type Also avoid setting a build type if that setting is meaningless, like with multi-config generators.
2021-12-05 12:42:48 +00:00
# Set a default build type if none was specified
set(_default_build_type "RelWithDebInfo")
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
set(CMAKE_BUILD_TYPE "${_default_build_type}" CACHE STRING "Choose the type of build." FORCE)
# Set the possible values of build type for cmake-gui
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
endif()
CMake: Improve a status message and add a comment
2021-11-15 14:27:42 +00:00
# Build type is ignored by multi-config generators.
CMake: Fix setting default build type Also avoid setting a build type if that setting is meaningless, like with multi-config generators.
2021-12-05 12:42:48 +00:00
if (NOT CMAKE_CONFIGURATION_TYPES)
message(STATUS "Using \"${CMAKE_GENERATOR}\" generator and build type \"${CMAKE_BUILD_TYPE}\"")
else()
message(STATUS "Using \"${CMAKE_GENERATOR}\" generator (multi-config)")
endif()
CMake: Improve a status message and add a comment
2021-11-15 14:27:42 +00:00
Start moving win-setup to PowerShell. Add win-setup.ps1, which duplicates the following tasks performed by config.nmake + Makefile.nmake + win-setup.sh: - Create the windows library directory. - Download files. - Download and unpack zip files. - Check and set current-tag.txt Don't verify applications or libraries. CMakeLists.txt does that. Update the Developer's Guide. Have POWERSHELL_COMMAND use dot sourcing instead of "-File", which appears to be a synonym for "-IgnoreTheExitStatusReturnedByThisScript". This removes our dependencies on unzip and wget and reduces our dependency on bash. Change-Id: Ia9def24acbe183d81b9d477fa42e655e4a3a6614 Reviewed-on: https://code.wireshark.org/review/7990 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-07 21:05:52 +00:00
#Where to find local cmake scripts
Cmake: Qt6 extends CMAKE_MODULE_PATH, work around this
2021-11-17 10:57:24 +00:00
set(WS_CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
set(CMAKE_MODULE_PATH ${WS_CMAKE_MODULE_PATH})
Start moving win-setup to PowerShell. Add win-setup.ps1, which duplicates the following tasks performed by config.nmake + Makefile.nmake + win-setup.sh: - Create the windows library directory. - Download files. - Download and unpack zip files. - Check and set current-tag.txt Don't verify applications or libraries. CMakeLists.txt does that. Update the Developer's Guide. Have POWERSHELL_COMMAND use dot sourcing instead of "-File", which appears to be a synonym for "-IgnoreTheExitStatusReturnedByThisScript". This removes our dependencies on unzip and wget and reduces our dependency on bash. Change-Id: Ia9def24acbe183d81b9d477fa42e655e4a3a6614 Reviewed-on: https://code.wireshark.org/review/7990 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-07 21:05:52 +00:00
CMake: Enable LTO/IPO support for all platforms
2021-05-23 18:44:07 +00:00
# CMake >= 3.9.0 supports LTO/IPO.
Build: Add LTO/IPO support Enable Link Time Optimization, also known as Interprocedural Optimization if the compiler supports it. Added a CMake option (ENABLE_LTO), defaulted to ON only on Windows Change-Id: Iea02b00aac12cc9a62595eeb8ff52382f1c4ddcd Reviewed-on: https://code.wireshark.org/review/37573 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-28 15:42:43 +00:00
if (ENABLE_LTO)
include(CheckIPOSupported)
CMake: Enable LTO/IPO support for all platforms
2021-05-23 18:44:07 +00:00
check_ipo_supported(RESULT lto_supported OUTPUT lto_output)
Build: Add LTO/IPO support Enable Link Time Optimization, also known as Interprocedural Optimization if the compiler supports it. Added a CMake option (ENABLE_LTO), defaulted to ON only on Windows Change-Id: Iea02b00aac12cc9a62595eeb8ff52382f1c4ddcd Reviewed-on: https://code.wireshark.org/review/37573 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-28 15:42:43 +00:00
if(lto_supported)
CMake: Make LTO default off, restrict to release build Link Time Optimizations increases build time a lot so restrict this optimization to release builds. Follow our build bots and make this option default off. Also LTO requires CMake >= 3.9 so make the LTO CMake option universally conditional on that requirement.
2021-07-22 20:29:37 +00:00
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE TRUE)
message(STATUS "LTO/IPO is enabled for Release configuration")
CMake: Enable LTO/IPO support for all platforms
2021-05-23 18:44:07 +00:00
else()
CMake: Adjust wsutil includes and linking. Mark wsutil's includes SYSTEM PRIVATE. This exposed a lot of targets that were indirectly picking up include paths via the wsutil target, so add direct includes where needed. The G.722 and G.726 codecs were implicilty including tiffio.h; find it explicitly instead. Mark some of wsutil's libraries PRIVATE, but leave commonly-used ones PUBLIC. Ping #17477.
2021-07-13 18:02:52 +00:00
message(STATUS "LTO/IPO requested but it is not supported by the compiler: ${lto_output}")
Build: Add LTO/IPO support Enable Link Time Optimization, also known as Interprocedural Optimization if the compiler supports it. Added a CMake option (ENABLE_LTO), defaulted to ON only on Windows Change-Id: Iea02b00aac12cc9a62595eeb8ff52382f1c4ddcd Reviewed-on: https://code.wireshark.org/review/37573 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-28 15:42:43 +00:00
endif()
else()
GitLab CI: Disable LTO on Windows `cmake -DENABLE_LTO=off ..` builds more quickly here, so add it to merge-req:windows. Fix a typo.
2020-12-12 23:29:05 +00:00
message(STATUS "LTO/IPO is not enabled")
Build: Add LTO/IPO support Enable Link Time Optimization, also known as Interprocedural Optimization if the compiler supports it. Added a CMake option (ENABLE_LTO), defaulted to ON only on Windows Change-Id: Iea02b00aac12cc9a62595eeb8ff52382f1c4ddcd Reviewed-on: https://code.wireshark.org/review/37573 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-06-28 15:42:43 +00:00
endif()
CMake: Set WIRESHARK_TARGET_PLATFORM. Set WIRESHARK_TARGET_PLATFORM near the top of CMakeLists.txt. It's used by a couple of our modules and will be used for NSIS packaging. Change-Id: Ief43733bdf162998cd54ff3732f94c8baa3d1e11 Reviewed-on: https://code.wireshark.org/review/6458 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 21:53:17 +00:00
# If our target platform is enforced by our generator, set
# WIRESHARK_TARGET_PLATFORM accordingly. Otherwise use
# %WIRESHARK_TARGET_PLATFORM%.
Fixup our anonsvn URLs. Change-Id: Id18d392bf7ff948fc78b684d8222c5c3725d302a Reviewed-on: https://code.wireshark.org/review/7886 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-02 19:10:36 +00:00
CMake: Set WIRESHARK_TARGET_PLATFORM. Set WIRESHARK_TARGET_PLATFORM near the top of CMakeLists.txt. It's used by a couple of our modules and will be used for NSIS packaging. Change-Id: Ief43733bdf162998cd54ff3732f94c8baa3d1e11 Reviewed-on: https://code.wireshark.org/review/6458 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 21:53:17 +00:00
if(WIN32)
Windows: Add preliminary support for MSYS2 If we are using MSYS2 we use those packages to build Wireshark using MinGW-w64 and disable most or all of our win-setup.ps1 codepaths. Fix GLib configuration. Disable copying of DLLs with MSYS2. Some tests in the suite_capture test suite are failing with MSYS MINGW64. That particular set of tests is way too brittle regarding file system paths; more work is needed to improve that situation.
2021-09-22 22:02:03 +00:00
# Are we using MSYS2? If we are we don't use our own third party
# libraries.
if(DEFINED ENV{MSYSTEM})
set(_msystem $ENV{MSYSTEM})
CMake: Fix typo
2021-11-15 14:29:35 +00:00
set(_repository False)
Windows: Add preliminary support for MSYS2 If we are using MSYS2 we use those packages to build Wireshark using MinGW-w64 and disable most or all of our win-setup.ps1 codepaths. Fix GLib configuration. Disable copying of DLLs with MSYS2. Some tests in the suite_capture test suite are failing with MSYS MINGW64. That particular set of tests is way too brittle regarding file system paths; more work is needed to improve that situation.
2021-09-22 22:02:03 +00:00
message(STATUS "Using MSYS2 with MSYSTEM=${_msystem}")
else()
set(_msystem False)
CMake: Fix typo
2021-11-15 14:29:35 +00:00
set(_repository True)
Windows: Add preliminary support for MSYS2 If we are using MSYS2 we use those packages to build Wireshark using MinGW-w64 and disable most or all of our win-setup.ps1 codepaths. Fix GLib configuration. Disable copying of DLLs with MSYS2. Some tests in the suite_capture test suite are failing with MSYS MINGW64. That particular set of tests is way too brittle regarding file system paths; more work is needed to improve that situation.
2021-09-22 22:02:03 +00:00
message(STATUS "Using 3rd party repository")
endif()
set(USE_MSYSTEM ${_msystem} CACHE INTERNAL "Use MSYS2 subsystem")
CMake: Fix typo
2021-11-15 14:29:35 +00:00
set(USE_REPOSITORY ${_repository} CACHE INTERNAL "Use Wireshark 3rd Party Repository")
Start moving win-setup to PowerShell. Add win-setup.ps1, which duplicates the following tasks performed by config.nmake + Makefile.nmake + win-setup.sh: - Create the windows library directory. - Download files. - Download and unpack zip files. - Check and set current-tag.txt Don't verify applications or libraries. CMakeLists.txt does that. Update the Developer's Guide. Have POWERSHELL_COMMAND use dot sourcing instead of "-File", which appears to be a synonym for "-IgnoreTheExitStatusReturnedByThisScript". This removes our dependencies on unzip and wget and reduces our dependency on bash. Change-Id: Ia9def24acbe183d81b9d477fa42e655e4a3a6614 Reviewed-on: https://code.wireshark.org/review/7990 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-07 21:05:52 +00:00
Windows: Add preliminary support for MSYS2 If we are using MSYS2 we use those packages to build Wireshark using MinGW-w64 and disable most or all of our win-setup.ps1 codepaths. Fix GLib configuration. Disable copying of DLLs with MSYS2. Some tests in the suite_capture test suite are failing with MSYS MINGW64. That particular set of tests is way too brittle regarding file system paths; more work is needed to improve that situation.
2021-09-22 22:02:03 +00:00
if(DEFINED ENV{WIRESHARK_TARGET_PLATFORM})
string(TOLOWER $ENV{WIRESHARK_TARGET_PLATFORM} _target_platform)
set(WIRESHARK_TARGET_PLATFORM ${_target_platform})
elseif(USE_MSYSTEM MATCHES "MINGW64")
set(WIRESHARK_TARGET_PLATFORM win64)
elseif(USE_MSYSTEM MATCHES "MINGW32")
set(WIRESHARK_TARGET_PLATFORM win32)
elseif(USE_MSYSTEM)
message(WARNING "Building for MSYSTEM=${USE_MSYSTEM} is not officially supported")
elseif(CMAKE_CL_64 OR CMAKE_GENERATOR MATCHES "Win64")
CMake: Set WIRESHARK_TARGET_PLATFORM. Set WIRESHARK_TARGET_PLATFORM near the top of CMakeLists.txt. It's used by a couple of our modules and will be used for NSIS packaging. Change-Id: Ief43733bdf162998cd54ff3732f94c8baa3d1e11 Reviewed-on: https://code.wireshark.org/review/6458 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 21:53:17 +00:00
set(WIRESHARK_TARGET_PLATFORM win64)
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
elseif(CMAKE_GENERATOR MATCHES "Visual Studio")
CMake: Set WIRESHARK_TARGET_PLATFORM. Set WIRESHARK_TARGET_PLATFORM near the top of CMakeLists.txt. It's used by a couple of our modules and will be used for NSIS packaging. Change-Id: Ief43733bdf162998cd54ff3732f94c8baa3d1e11 Reviewed-on: https://code.wireshark.org/review/6458 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 21:53:17 +00:00
set(WIRESHARK_TARGET_PLATFORM win32)
CMake: Add guards for PLATFORM sanity check The sanity check is specific for Visual Studio so add those guards. The PLATFORM variable is not standard for other toolchains. Add a default "windows target platform" of Win64. Add error output for win-setup.ps1.
2021-09-20 13:14:03 +00:00
else()
CMake: Target platform for WIN32 needs to be lower case Capitalization matters here. We are now accepting this value from the environment so we need to lower case that string. Add an extra sanity check and status message for target CPU architecture to help detect mismatches.
2021-09-22 12:40:57 +00:00
message(WARNING "Assuming \"win64\" target platform")
CMake: Add guards for PLATFORM sanity check The sanity check is specific for Visual Studio so add those guards. The PLATFORM variable is not standard for other toolchains. Add a default "windows target platform" of Win64. Add error output for win-setup.ps1.
2021-09-20 13:14:03 +00:00
set(WIRESHARK_TARGET_PLATFORM win64)
CMake: Set WIRESHARK_TARGET_PLATFORM. Set WIRESHARK_TARGET_PLATFORM near the top of CMakeLists.txt. It's used by a couple of our modules and will be used for NSIS packaging. Change-Id: Ief43733bdf162998cd54ff3732f94c8baa3d1e11 Reviewed-on: https://code.wireshark.org/review/6458 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 21:53:17 +00:00
endif()
CMake: Add a build environment == generator check. If we're building on Windows and %Platform% is "x64" or undefined, check it against our generator's target platform. Update the "${CMAKE_GENERATOR} MATCHES" regexes to match what CMake uses internally. Change-Id: I33996344978855cbdf7c1ee9e55b7340efea5b5c Reviewed-on: https://code.wireshark.org/review/7994 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-09 00:36:35 +00:00
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
if(WIRESHARK_TARGET_PLATFORM MATCHES "win64")
CMake: Don't shadow PROCESSOR_ARCHITECTURE. PROCESSOR_ARCHITECTURE is a standard Windows environment variable. Rename the CMake variable WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE. Change-Id: I03109d45d6fb5f00742cd43085a9d33d9e5ddf1f Reviewed-on: https://code.wireshark.org/review/25721 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-09 21:59:15 +00:00
set(WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE amd64)
CMake: Target platform for WIN32 needs to be lower case Capitalization matters here. We are now accepting this value from the environment so we need to lower case that string. Add an extra sanity check and status message for target CPU architecture to help detect mismatches.
2021-09-22 12:40:57 +00:00
elseif(WIRESHARK_TARGET_PLATFORM MATCHES "win32")
CMake: Fail if we're building for 32-bit Windows. Fail noisily if we're building for 32-bit Windows. Ping #17779.
2022-04-22 16:56:45 +00:00
message(FATAL_ERROR "Deprecated target platform ${WIRESHARK_TARGET_PLATFORM}. See https://gitlab.com/wireshark/wireshark/-/issues/17779 for details.")
CMake: Don't shadow PROCESSOR_ARCHITECTURE. PROCESSOR_ARCHITECTURE is a standard Windows environment variable. Rename the CMake variable WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE. Change-Id: I03109d45d6fb5f00742cd43085a9d33d9e5ddf1f Reviewed-on: https://code.wireshark.org/review/25721 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-09 21:59:15 +00:00
set(WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE x86)
CMake: Target platform for WIN32 needs to be lower case Capitalization matters here. We are now accepting this value from the environment so we need to lower case that string. Add an extra sanity check and status message for target CPU architecture to help detect mismatches.
2021-09-22 12:40:57 +00:00
else()
message(FATAL_ERROR "Invalid target platform: ${WIRESHARK_TARGET_PLATFORM}")
CMake: Always set PROCESSOR_ARCHITECTURE on Windows. An undefined or invalid PROCESSOR_ARCHITECTURE will produce an invalid wireshark.exe.manifest. Make sure it's always set. Change-Id: I1b33f7bd5e964f05344919d1f11d88c14104c0ce Reviewed-on: https://code.wireshark.org/review/8253 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-30 18:35:57 +00:00
endif()
Start moving win-setup to PowerShell. Add win-setup.ps1, which duplicates the following tasks performed by config.nmake + Makefile.nmake + win-setup.sh: - Create the windows library directory. - Download files. - Download and unpack zip files. - Check and set current-tag.txt Don't verify applications or libraries. CMakeLists.txt does that. Update the Developer's Guide. Have POWERSHELL_COMMAND use dot sourcing instead of "-File", which appears to be a synonym for "-IgnoreTheExitStatusReturnedByThisScript". This removes our dependencies on unzip and wget and reduces our dependency on bash. Change-Id: Ia9def24acbe183d81b9d477fa42e655e4a3a6614 Reviewed-on: https://code.wireshark.org/review/7990 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-07 21:05:52 +00:00
# Sanity check
CMake: Add guards for PLATFORM sanity check The sanity check is specific for Visual Studio so add those guards. The PLATFORM variable is not standard for other toolchains. Add a default "windows target platform" of Win64. Add error output for win-setup.ps1.
2021-09-20 13:14:03 +00:00
if(MSVC)
if(DEFINED ENV{PLATFORM})
string(TOLOWER $ENV{PLATFORM} _vs_platform)
else()
set(_vs_platform "[undefined]") # x86
endif()
if(
(_vs_platform STREQUAL "x64" AND NOT WIRESHARK_TARGET_PLATFORM STREQUAL "win64")
OR
(_vs_platform STREQUAL "[undefined]" AND NOT WIRESHARK_TARGET_PLATFORM STREQUAL "win32")
)
message(FATAL_ERROR "The PLATFORM environment variable (${_vs_platform})"
" doesn't match the generator platform (${WIRESHARK_TARGET_PLATFORM})")
endif()
CMake: Add a build environment == generator check. If we're building on Windows and %Platform% is "x64" or undefined, check it against our generator's target platform. Update the "${CMAKE_GENERATOR} MATCHES" regexes to match what CMake uses internally. Change-Id: I33996344978855cbdf7c1ee9e55b7340efea5b5c Reviewed-on: https://code.wireshark.org/review/7994 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-09 00:36:35 +00:00
endif()
CMake: Target platform for WIN32 needs to be lower case Capitalization matters here. We are now accepting this value from the environment so we need to lower case that string. Add an extra sanity check and status message for target CPU architecture to help detect mismatches.
2021-09-22 12:40:57 +00:00
message(STATUS
CMake: Improve a status message and add a comment
2021-11-15 14:27:42 +00:00
"Building for ${WIRESHARK_TARGET_PLATFORM} \
Windows: Add preliminary support for MSYS2 If we are using MSYS2 we use those packages to build Wireshark using MinGW-w64 and disable most or all of our win-setup.ps1 codepaths. Fix GLib configuration. Disable copying of DLLs with MSYS2. Some tests in the suite_capture test suite are failing with MSYS MINGW64. That particular set of tests is way too brittle regarding file system paths; more work is needed to improve that situation.
2021-09-22 22:02:03 +00:00
and CPU target ${WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE}"
CMake: Target platform for WIN32 needs to be lower case Capitalization matters here. We are now accepting this value from the environment so we need to lower case that string. Add an extra sanity check and status message for target CPU architecture to help detect mismatches.
2021-09-22 12:40:57 +00:00
)
CMake: Set WIRESHARK_TARGET_PLATFORM. Set WIRESHARK_TARGET_PLATFORM near the top of CMakeLists.txt. It's used by a couple of our modules and will be used for NSIS packaging. Change-Id: Ief43733bdf162998cd54ff3732f94c8baa3d1e11 Reviewed-on: https://code.wireshark.org/review/6458 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-09 21:53:17 +00:00
CMakeLists (root): fix indent (use tabs) Change-Id: I14089fbdafa00280ff7b3148c2e0a880b925958e Reviewed-on: https://code.wireshark.org/review/11872 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-16 14:02:16 +00:00
# Determine where the 3rd party libraries will be
Windows: Add preliminary support for MSYS2 If we are using MSYS2 we use those packages to build Wireshark using MinGW-w64 and disable most or all of our win-setup.ps1 codepaths. Fix GLib configuration. Disable copying of DLLs with MSYS2. Some tests in the suite_capture test suite are failing with MSYS MINGW64. That particular set of tests is way too brittle regarding file system paths; more work is needed to improve that situation.
2021-09-22 22:02:03 +00:00
if(USE_REPOSITORY)
find_package(PowerShell REQUIRED)
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")
endif()
CMake minor updates Fix up generation messages for Windows build Remove some superfluous Lua messages Change-Id: I405e7edfcb043fc842fe4f0cca8d23d5755527f9 Reviewed-on: https://code.wireshark.org/review/8138 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-20 15:36:06 +00:00
Windows: Add preliminary support for MSYS2 If we are using MSYS2 we use those packages to build Wireshark using MinGW-w64 and disable most or all of our win-setup.ps1 codepaths. Fix GLib configuration. Disable copying of DLLs with MSYS2. Some tests in the suite_capture test suite are failing with MSYS MINGW64. That particular set of tests is way too brittle regarding file system paths; more work is needed to improve that situation.
2021-09-22 22:02:03 +00:00
# Download third-party libraries
file (TO_NATIVE_PATH ${CMAKE_SOURCE_DIR}/tools/win-setup.ps1 _win_setup)
file (TO_NATIVE_PATH ${_PROJECT_LIB_DIR} _ws_lib_dir)
Tools: Add a CMakeExecutable parameter to win-setup.ps1. 52054046c1 switched archive extraction from 7Zip to CMake. This removed a dependency on 7Zip, but assumed that CMake was in our PATH. Add a CMakeExecutable to win-setup.ps1 and use it in CMakeLists.txt to pass the value of CMAKE_COMMAND.
2022-05-25 17:29:57 +00:00
file (TO_NATIVE_PATH ${CMAKE_COMMAND} _win_cmake_command)
Windows: Add preliminary support for MSYS2 If we are using MSYS2 we use those packages to build Wireshark using MinGW-w64 and disable most or all of our win-setup.ps1 codepaths. Fix GLib configuration. Disable copying of DLLs with MSYS2. Some tests in the suite_capture test suite are failing with MSYS MINGW64. That particular set of tests is way too brittle regarding file system paths; more work is needed to improve that situation.
2021-09-22 22:02:03 +00:00
# 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(
Tools: Add a CMakeExecutable parameter to win-setup.ps1. 52054046c1 switched archive extraction from 7Zip to CMake. This removed a dependency on 7Zip, but assumed that CMake was in our PATH. Add a CMakeExecutable to win-setup.ps1 and use it in CMakeLists.txt to pass the value of CMAKE_COMMAND.
2022-05-25 17:29:57 +00:00
COMMAND ${POWERSHELL_COMMAND} "\"${_win_setup}\"" -Destination "${_ws_lib_dir}" -Platform ${WIRESHARK_TARGET_PLATFORM} -CMakeExecutable "\"${_win_cmake_command}\""
Windows: Add preliminary support for MSYS2 If we are using MSYS2 we use those packages to build Wireshark using MinGW-w64 and disable most or all of our win-setup.ps1 codepaths. Fix GLib configuration. Disable copying of DLLs with MSYS2. Some tests in the suite_capture test suite are failing with MSYS MINGW64. That particular set of tests is way too brittle regarding file system paths; more work is needed to improve that situation.
2021-09-22 22:02:03 +00:00
RESULT_VARIABLE _win_setup_failed
ERROR_VARIABLE _win_setup_error_output
)
if(_win_setup_failed)
message(FATAL_ERROR "Windows setup (win-setup.ps1) failed: ${_win_setup_error_output}.")
endif()
Start moving win-setup to PowerShell. Add win-setup.ps1, which duplicates the following tasks performed by config.nmake + Makefile.nmake + win-setup.sh: - Create the windows library directory. - Download files. - Download and unpack zip files. - Check and set current-tag.txt Don't verify applications or libraries. CMakeLists.txt does that. Update the Developer's Guide. Have POWERSHELL_COMMAND use dot sourcing instead of "-File", which appears to be a synonym for "-IgnoreTheExitStatusReturnedByThisScript". This removes our dependencies on unzip and wget and reduces our dependency on bash. Change-Id: Ia9def24acbe183d81b9d477fa42e655e4a3a6614 Reviewed-on: https://code.wireshark.org/review/7990 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-07 21:05:52 +00:00
Windows: Add preliminary support for MSYS2 If we are using MSYS2 we use those packages to build Wireshark using MinGW-w64 and disable most or all of our win-setup.ps1 codepaths. Fix GLib configuration. Disable copying of DLLs with MSYS2. Some tests in the suite_capture test suite are failing with MSYS MINGW64. That particular set of tests is way too brittle regarding file system paths; more work is needed to improve that situation.
2021-09-22 22:02:03 +00:00
set(EXTRA_INSTALLER_DIR ${_ws_lib_dir})
NSIS: Fix our extra installer location. We know the native Windows library path early on in the configure process. Use it to set the location of the Npcap and USBPcap installers instead of trying to derive it from the GLib DLL path. Change-Id: I02d48e115b374fb6080a7fe8017cba789254d5f1 Reviewed-on: https://code.wireshark.org/review/32475 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-03-18 23:32:54 +00:00
Windows: Add preliminary support for MSYS2 If we are using MSYS2 we use those packages to build Wireshark using MinGW-w64 and disable most or all of our win-setup.ps1 codepaths. Fix GLib configuration. Disable copying of DLLs with MSYS2. Some tests in the suite_capture test suite are failing with MSYS MINGW64. That particular set of tests is way too brittle regarding file system paths; more work is needed to improve that situation.
2021-09-22 22:02:03 +00:00
# XXX Add a dependency on ${_ws_lib_dir}/current_tag.txt?
endif()
Start moving win-setup to PowerShell. Add win-setup.ps1, which duplicates the following tasks performed by config.nmake + Makefile.nmake + win-setup.sh: - Create the windows library directory. - Download files. - Download and unpack zip files. - Check and set current-tag.txt Don't verify applications or libraries. CMakeLists.txt does that. Update the Developer's Guide. Have POWERSHELL_COMMAND use dot sourcing instead of "-File", which appears to be a synonym for "-IgnoreTheExitStatusReturnedByThisScript". This removes our dependencies on unzip and wget and reduces our dependency on bash. Change-Id: Ia9def24acbe183d81b9d477fa42e655e4a3a6614 Reviewed-on: https://code.wireshark.org/review/7990 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-07 21:05:52 +00:00
endif(WIN32)
Reorder some statements to avoid unused build-type directories Change-Id: I4209eff78faa619030d3cacdc759fd143a238247 Reviewed-on: https://code.wireshark.org/review/2526 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-21 09:10:38 +00:00
Having CmakeListsCustom.txt in git defeats the purpose of its existence: If it is used, there is a modified file in git. Fix this by only including the file if it exists. Other changes: - Rename the existing Custom files to CMakeListsCustom.txt.example. - Move the plugins custom file to the top level (same level as its including parent). - Optionally allow a list of custom includes instead of the default one. Change-Id: I8960eac6222f741c045055d43d1d5a2d4979caf6 Reviewed-on: https://code.wireshark.org/review/4163 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-09-18 06:05:48 +00:00
include(UseCustomIncludes)
Revert "Move inclusion of CmakeListsCustom to the end of the file in order to have all defines in place." This reverts commit bcbcad1e597f89e64389b6cc25b2fdbe9f89d960. This change breaks building of custom plugins. Change-Id: I63e88ceb922ca23ead9784705ad8ba088a504fd1 Reviewed-on: https://code.wireshark.org/review/15893 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-14 15:37:33 +00:00
ADD_CUSTOM_CMAKE_INCLUDE()
Having CmakeListsCustom.txt in git defeats the purpose of its existence: If it is used, there is a modified file in git. Fix this by only including the file if it exists. Other changes: - Rename the existing Custom files to CMakeListsCustom.txt.example. - Move the plugins custom file to the top level (same level as its including parent). - Optionally allow a list of custom includes instead of the default one. Change-Id: I8960eac6222f741c045055d43d1d5a2d4979caf6 Reviewed-on: https://code.wireshark.org/review/4163 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-09-18 06:05:48 +00:00
cmake: fix CMP0026 deprecation warning in CMake 3.9 Since CMake 3.9, all policies before CMP0036 emit a warning. Fix the warning by not relying on the old behavior (existence of the LOCATION property). Tested with Ninja, the cmake output, rules.ninja and build.ninja output is identical (minus the deprecation warning). Change-Id: I058699380b01a9c02d9b98fd485ce6ded427abe3 Reviewed-on: https://code.wireshark.org/review/23915 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-14 19:13:52 +00:00
# Ensure that all executables and libraries end up in the same directory. Actual
# files might end up in a configuration subdirectory, e.g. run/Debug or
# run/Release. We try to set DATAFILE_DIR to actual location below.
Reorder some statements to avoid unused build-type directories Change-Id: I4209eff78faa619030d3cacdc759fd143a238247 Reviewed-on: https://code.wireshark.org/review/2526 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-21 09:10:38 +00:00
if(NOT ARCHIVE_OUTPUT_PATH)
CMake: Fix DOCDIR on Unix User guides are installed to doc/Wireshark. Use doc/wireshark instead. Remove leftover variable CPACK_PACKAGE_NAME. Change-Id: I9a1d6bdc7d8f0b48c61e43679285d5ba83904a63 Reviewed-on: https://code.wireshark.org/review/31851 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-02-01 16:25:24 +00:00
set(ARCHIVE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/run CACHE INTERNAL
Reorder some statements to avoid unused build-type directories Change-Id: I4209eff78faa619030d3cacdc759fd143a238247 Reviewed-on: https://code.wireshark.org/review/2526 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-21 09:10:38 +00:00
"Single output directory for building all archives.")
endif()
if(NOT EXECUTABLE_OUTPUT_PATH)
CMake: Fix DOCDIR on Unix User guides are installed to doc/Wireshark. Use doc/wireshark instead. Remove leftover variable CPACK_PACKAGE_NAME. Change-Id: I9a1d6bdc7d8f0b48c61e43679285d5ba83904a63 Reviewed-on: https://code.wireshark.org/review/31851 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-02-01 16:25:24 +00:00
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/run CACHE INTERNAL
Reorder some statements to avoid unused build-type directories Change-Id: I4209eff78faa619030d3cacdc759fd143a238247 Reviewed-on: https://code.wireshark.org/review/2526 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-21 09:10:38 +00:00
"Single output directory for building all executables.")
endif()
if(NOT LIBRARY_OUTPUT_PATH)
CMake: Fix DOCDIR on Unix User guides are installed to doc/Wireshark. Use doc/wireshark instead. Remove leftover variable CPACK_PACKAGE_NAME. Change-Id: I9a1d6bdc7d8f0b48c61e43679285d5ba83904a63 Reviewed-on: https://code.wireshark.org/review/31851 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-02-01 16:25:24 +00:00
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/run CACHE INTERNAL
Reorder some statements to avoid unused build-type directories Change-Id: I4209eff78faa619030d3cacdc759fd143a238247 Reviewed-on: https://code.wireshark.org/review/2526 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-21 09:10:38 +00:00
"Single output directory for building all libraries.")
endif()
CMake: Copy data files to the run directory. Set DATAFILE_DIR to a value that includes the build configuration. Add a copy_data_files target that copies AUTHORS-SHORT, the default filters, and other support files to the run directory. Add FindPowerShell.cmake and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ declarations which are now covered by copy_data_files. Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 Reviewed-on: https://code.wireshark.org/review/6561 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 21:07:48 +00:00
Fix some comments. "The release mode (CMAKE_BUILD_TYPE=release) defines NDEBUG" isn't Linux-specific; it's true in the Unix Makefile generator, and possibly in other generators. (The Visual Studio generator, at least for newer versions of VS, lets you specify at *build* time what type of build to do, so the generated build files don't unconditionally define, or not define, NDEBUG, they do so based on the build type.) The RPATH stuff is done on Unix-like systems *except* for macOS. Change-Id: Ieffbaaa9a8e11a1a30b34036a2412c6735baa0c8 Reviewed-on: https://code.wireshark.org/review/23114 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-17 21:38:54 +00:00
#
# The release mode (CMAKE_BUILD_TYPE=release) defines NDEBUG for
# the Unix Makefile generator.
#
CMake: Change some install() paths to match NSIS package Currently our Windows code looks for data files in the same folder as the binary executable (presumably to make the application relocatable, although it should be possible to improve this with relative paths?). Ping-Bug: 15301 Change-Id: I0fef4e87dc9d1d8edef81dd11755761fddd0fd12 Reviewed-on: https://code.wireshark.org/review/30819 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-11-23 20:39:51 +00:00
# Defines CMAKE_INSTALL_BINDIR, CMAKE_INSTALL_DATADIR, etc ...
if(WIN32)
# Override some values on Windows, to match the existing
# convention of installing everything to a single root folder.
set(CMAKE_INSTALL_BINDIR ".")
set(CMAKE_INSTALL_LIBDIR ".")
set(CMAKE_INSTALL_INCLUDEDIR "include")
set(CMAKE_INSTALL_DATADIR ".")
CMake: Install documentation to docdir Change-Id: I6860f2ba8c09daff3a72e44f0c41a1b19fb79218 Reviewed-on: https://code.wireshark.org/review/31852 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-02-01 16:46:45 +00:00
set(CMAKE_INSTALL_DOCDIR ".")
CMake: Simplify CMAKE_INSTALL_DATADIR usage Change-Id: I414aa551b8e9315a654f4da62b882e787d4f6d53 Reviewed-on: https://code.wireshark.org/review/30904 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-12-03 19:23:35 +00:00
else()
# By default INSTALL_DATADIR is set to INSTALL_DATAROOTDIR, set the
# proper value here.
CMake: Fix DOCDIR on Unix User guides are installed to doc/Wireshark. Use doc/wireshark instead. Remove leftover variable CPACK_PACKAGE_NAME. Change-Id: I9a1d6bdc7d8f0b48c61e43679285d5ba83904a63 Reviewed-on: https://code.wireshark.org/review/31851 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-02-01 16:25:24 +00:00
set(CMAKE_INSTALL_DATADIR "share/${PROJECT_NAME}"
CMake: Simplify CMAKE_INSTALL_DATADIR usage Change-Id: I414aa551b8e9315a654f4da62b882e787d4f6d53 Reviewed-on: https://code.wireshark.org/review/30904 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-12-03 19:23:35 +00:00
CACHE PATH "Read-only architecture-independent data"
)
CMake: Change some install() paths to match NSIS package Currently our Windows code looks for data files in the same folder as the binary executable (presumably to make the application relocatable, although it should be possible to improve this with relative paths?). Ping-Bug: 15301 Change-Id: I0fef4e87dc9d1d8edef81dd11755761fddd0fd12 Reviewed-on: https://code.wireshark.org/review/30819 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-11-23 20:39:51 +00:00
endif()
CMake: Use GNUInstallDirs module instead of our own Change-Id: I42f62824f226b091ff9bb86ce5c222333f98d783 Reviewed-on: https://code.wireshark.org/review/23379 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-03 15:22:17 +00:00
include(GNUInstallDirs)
CMake: Change some install() paths to match NSIS package Currently our Windows code looks for data files in the same folder as the binary executable (presumably to make the application relocatable, although it should be possible to improve this with relative paths?). Ping-Bug: 15301 Change-Id: I0fef4e87dc9d1d8edef81dd11755761fddd0fd12 Reviewed-on: https://code.wireshark.org/review/30819 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-11-23 20:39:51 +00:00
CMake: Fix DOCDIR on Unix User guides are installed to doc/Wireshark. Use doc/wireshark instead. Remove leftover variable CPACK_PACKAGE_NAME. Change-Id: I9a1d6bdc7d8f0b48c61e43679285d5ba83904a63 Reviewed-on: https://code.wireshark.org/review/31851 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-02-01 16:25:24 +00:00
set(PROJECT_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}")
Fix more repeated words throughout Fixes more repeated words seen throughout the code base.
2021-12-31 03:03:45 +00:00
# Make sure our executables can load our libraries if we install into
Fix some comments. "The release mode (CMAKE_BUILD_TYPE=release) defines NDEBUG" isn't Linux-specific; it's true in the Unix Makefile generator, and possibly in other generators. (The Visual Studio generator, at least for newer versions of VS, lets you specify at *build* time what type of build to do, so the generated build files don't unconditionally define, or not define, NDEBUG, they do so based on the build type.) The RPATH stuff is done on Unix-like systems *except* for macOS. Change-Id: Ieffbaaa9a8e11a1a30b34036a2412c6735baa0c8 Reviewed-on: https://code.wireshark.org/review/23114 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-17 21:38:54 +00:00
# a non-default directory on Unix-like systems other than macOS.
CMake: do not set RPATH when installing to a system directory When built with -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib (as is done by many Linux distributions), do not set an unnecessary RPATH. This was the case before v2.9.0rc0-2727-g697623411c. Relocatable builds will still be possible with the default options as /usr/local/lib is typically not considered a system library path. Change-Id: Ic6ff1760183c20d3f9f9fb787604e888e116534e Reviewed-on: https://code.wireshark.org/review/31602 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-19 00:59:29 +00:00
# https://gitlab.kitware.com/cmake/community/wikis/doc/cmake/RPATH-handling
CMake: Set a direct rpath for libraries Instead of using "$ORIGIN/../lib" just use "$ORIGIN". Also be explicit in configuring the relative RPATH. We don't want to assume a default relative path, in case more targets are addded, out of caution. Change-Id: I3b7f5e8de7be8bb30aca3b433212113d876c4163 Reviewed-on: https://code.wireshark.org/review/31647 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-21 10:56:57 +00:00
set(LIBRARY_INSTALL_RPATH "")
set(EXECUTABLE_INSTALL_RPATH "")
set(EXTCAP_INSTALL_RPATH "")
CMake: add USE_STATIC option USE_STATIC will: - always link statically with external libraries (such as glib2) - will not set rpath to avoid the following error: CMake Error at cmake_install.cmake:50 (file): file RPATH_CHANGE could not write new RPATH: /usr/lib to the file: /home/fabrice/br-test-pkg/br-arm-full-static/target/usr/bin/tshark No valid ELF RPATH or RUNPATH entry exists in the file; Change-Id: I242dc1a091cc211ee891568a2dee5080c9974fba Ping-Bug: 15713 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Reviewed-on: https://code.wireshark.org/review/32945 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-22 16:39:52 +00:00
if(NOT (WIN32 OR APPLE OR USE_STATIC))
CMake: do not set RPATH when installing to a system directory When built with -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib (as is done by many Linux distributions), do not set an unnecessary RPATH. This was the case before v2.9.0rc0-2727-g697623411c. Relocatable builds will still be possible with the default options as /usr/local/lib is typically not considered a system library path. Change-Id: Ic6ff1760183c20d3f9f9fb787604e888e116534e Reviewed-on: https://code.wireshark.org/review/31602 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-19 00:59:29 +00:00
# Try to set a RPATH for installed binaries if the library directory is
# not already included in the default search list.
list(FIND CMAKE_C_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_FULL_LIBDIR}" IS_SYSTEM_DIR)
if(IS_SYSTEM_DIR EQUAL -1)
# Some systems support $ORIGIN in RPATH to enable relocatable
# binaries. In other cases, only absolute paths can be used.
# https://www.lekensteyn.nl/rpath.html
if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|SunOS|FreeBSD)$")
CMake: disable relocatable builds when dumpcap is being built dumpcap with capabilities/setuid currently does not start due to missing libwsutil when installed to a non-standard prefix such as /usr/local. Bug: 15490 Change-Id: If7427ba9625d3702ab8aac2deeaf37b6d3fda2a0 Reviewed-on: https://code.wireshark.org/review/31995 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-12 16:55:27 +00:00
set(_enable_rpath_origin TRUE)
CMake: Warn if dumpcap cannot be built Change-Id: I4eff2e7b75f3dd896ebd63e50a83f90da6a910b6 Reviewed-on: https://code.wireshark.org/review/34606 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-09-22 12:35:27 +00:00
if(BUILD_dumpcap AND ENABLE_PCAP)
CMake: disable relocatable builds when dumpcap is being built dumpcap with capabilities/setuid currently does not start due to missing libwsutil when installed to a non-standard prefix such as /usr/local. Bug: 15490 Change-Id: If7427ba9625d3702ab8aac2deeaf37b6d3fda2a0 Reviewed-on: https://code.wireshark.org/review/31995 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-12 16:55:27 +00:00
# dumpcap will most likely be installed with
# capabilities or setuid. Relative RPATHs that
# resolve to non-standard library directories
# are ignored for such binaries and since we
# cannot achieve relocatable builds, just
# disable it by default.
set(_enable_rpath_origin FALSE)
endif()
Fix build with non-standard install prefix The variables BUILD_dumpcap and PCAP_FOUND are defined after the if condition, therefore wireshark is built with a relative RPATH and library loading for privileged processes fails with glibc. Move the definition of BUILD_dumpcap before it is used and drop the test for PCAP_FOUND. Move a comment to the proper line while at it. Change-Id: Ie151a3781898e712f9e324e9ef995022bbea40b6 Reviewed-on: https://code.wireshark.org/review/34564 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-09-17 18:07:54 +00:00
# Provide a knob to optionally force absolute rpaths,
# to support old/buggy systems and as a user preference
# for hardening.
CMake: disable relocatable builds when dumpcap is being built dumpcap with capabilities/setuid currently does not start due to missing libwsutil when installed to a non-standard prefix such as /usr/local. Bug: 15490 Change-Id: If7427ba9625d3702ab8aac2deeaf37b6d3fda2a0 Reviewed-on: https://code.wireshark.org/review/31995 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-12 16:55:27 +00:00
set(ENABLE_RPATH_ORIGIN ${_enable_rpath_origin} CACHE BOOL
CMake: do not set RPATH when installing to a system directory When built with -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib (as is done by many Linux distributions), do not set an unnecessary RPATH. This was the case before v2.9.0rc0-2727-g697623411c. Relocatable builds will still be possible with the default options as /usr/local/lib is typically not considered a system library path. Change-Id: Ic6ff1760183c20d3f9f9fb787604e888e116534e Reviewed-on: https://code.wireshark.org/review/31602 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-19 00:59:29 +00:00
"Use $ORIGIN with INSTALL_RPATH")
mark_as_advanced(ENABLE_RPATH_ORIGIN)
else()
set(ENABLE_RPATH_ORIGIN FALSE)
endif()
if(ENABLE_RPATH_ORIGIN)
CMake: Set a direct rpath for libraries Instead of using "$ORIGIN/../lib" just use "$ORIGIN". Also be explicit in configuring the relative RPATH. We don't want to assume a default relative path, in case more targets are addded, out of caution. Change-Id: I3b7f5e8de7be8bb30aca3b433212113d876c4163 Reviewed-on: https://code.wireshark.org/review/31647 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-21 10:56:57 +00:00
set(LIBRARY_INSTALL_RPATH "$ORIGIN")
set(EXECUTABLE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
set(EXTCAP_INSTALL_RPATH "$ORIGIN/../..")
CMake: do not set RPATH when installing to a system directory When built with -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib (as is done by many Linux distributions), do not set an unnecessary RPATH. This was the case before v2.9.0rc0-2727-g697623411c. Relocatable builds will still be possible with the default options as /usr/local/lib is typically not considered a system library path. Change-Id: Ic6ff1760183c20d3f9f9fb787604e888e116534e Reviewed-on: https://code.wireshark.org/review/31602 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-19 00:59:29 +00:00
else()
CMake: Set a direct rpath for libraries Instead of using "$ORIGIN/../lib" just use "$ORIGIN". Also be explicit in configuring the relative RPATH. We don't want to assume a default relative path, in case more targets are addded, out of caution. Change-Id: I3b7f5e8de7be8bb30aca3b433212113d876c4163 Reviewed-on: https://code.wireshark.org/review/31647 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-21 10:56:57 +00:00
set(LIBRARY_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
set(EXECUTABLE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
set(EXTCAP_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
CMake: do not set RPATH when installing to a system directory When built with -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib (as is done by many Linux distributions), do not set an unnecessary RPATH. This was the case before v2.9.0rc0-2727-g697623411c. Relocatable builds will still be possible with the default options as /usr/local/lib is typically not considered a system library path. Change-Id: Ic6ff1760183c20d3f9f9fb787604e888e116534e Reviewed-on: https://code.wireshark.org/review/31602 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-19 00:59:29 +00:00
endif()
# Include non-standard external libraries by default in RPATH.
if(NOT DEFINED CMAKE_INSTALL_RPATH_USE_LINK_PATH)
CMake: Use $ORIGIN with RPATH Make our package relocatable on Unix systems. Linux, Solaris and FreeBSD are known to support $ORIGIN. Change-Id: Ibcdda33d62c075bfa867d006cb6aaf5824609011 Reviewed-on: https://code.wireshark.org/review/30896 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-03 05:32:17 +00:00
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
endif()
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
endif()
CMake: Update RPATH during installation. If we're installing into a non-system prefix on UNIX or Linux, make sure CMake updates our RPATHs accordingly. Change-Id: Ia6eaa6533c996a8228cff25e9d2032b223781681 Reviewed-on: https://code.wireshark.org/review/23040 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-10 16:35:21 +00:00
endif()
- Reenable /LARGEADDRESSAWARE on Windows platform - Add a CMAKE_BUILD_TYPE default of RelWithDebInfo (Release with debug info), print the choice. This will pick up the previously used flags LINK_FLAGS and CMAKE_C_FLAGS and CMAKE_CXX_FLAGS but also pick up the variables postfixed by _<build-type> - Remove Optimization (-O2) and debug (-g) flags from list of default flags as they are now automagically set by CMAKE_C_FLAGS_RELWITHDEBINFO etc. NOTE: This also needs to be done for the Windows flags, I just don't have a Win system to test on right now. svn path=/trunk/; revision=53083
2013-11-04 20:29:29 +00:00
CMake: set CMAKE_BUILD_RPATH_USE_ORIGIN Tested with cmake v3.13.3-952-gf4c17c041, the resulting binaries indeed contain $ORIGIN and are invariant of the build directory. Change-Id: I5dad9493a6d54a0b03a3494fce69cc69a25b2f84 Ping-Bug: 15163 Reviewed-on: https://code.wireshark.org/review/31586 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-18 10:18:42 +00:00
# Ensure that executables in the build directory always have the same RPATH.
# This ensures relocatable binaries and reproducible builds (invariant of the
# build directory location). (Requires CMake 3.14)
set(CMAKE_BUILD_RPATH_USE_ORIGIN ON)
CMake: wsetargv.obj is specific to Visual Studio
2021-07-14 02:10:25 +00:00
if(MSVC)
Use wsetargv.obj, and wmain() rather than main(), on Windows. Doing so for command-line programs means that the argument list doesn't ever get converted to the local code page; converting to the local code page can mangle file names that *can't* be converted to the local code page. Furthermore, code that uses setargv.obj rather than wsetargv.obj has issues in some versions of Windows 10; see bug 15151. That means that converting the argument list to UTF-8 is a bit simpler - we don't need to call GetCommandLineW() or CommandLineToArgvW(), we just loop over the UTF-16LE argument strings in argv[]. While we're at it, note in Wireshark's main() why we discard argv on Windows (Qt does the same "convert-to-the-local-code-page" stuff); that means we *do* need to call GetCommandLineW() and CommandLineToArgvW() in main() (i.e., we duplicate what Qt's WinMain() does, but converting to UTF-8 rather than to the local code page). Change-Id: I35b57c1b658fb3e9b0c685097afe324e9fe98649 Ping-Bug: 15151 Reviewed-on: https://code.wireshark.org/review/30051 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-07 17:06:00 +00:00
# Linking with wsetargv.obj enables "wildcard expansion" of
We should only link executables with setargv.obj. Libraries shouldn't be linked with it. See if this fixes the weird problems I'm having with mergecap - including, apparently, the mergecap from the buildbots - when run with wildcard arguments, terminating before it gets to main() (making it hard to try to debug bug 15151). Change-Id: Ie793b0ea8157186a121106636ac8b782457c09f5 Reviewed-on: https://code.wireshark.org/review/29985 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-02 20:33:02 +00:00
# command-line arguments.
Use wsetargv.obj, and wmain() rather than main(), on Windows. Doing so for command-line programs means that the argument list doesn't ever get converted to the local code page; converting to the local code page can mangle file names that *can't* be converted to the local code page. Furthermore, code that uses setargv.obj rather than wsetargv.obj has issues in some versions of Windows 10; see bug 15151. That means that converting the argument list to UTF-8 is a bit simpler - we don't need to call GetCommandLineW() or CommandLineToArgvW(), we just loop over the UTF-16LE argument strings in argv[]. While we're at it, note in Wireshark's main() why we discard argv on Windows (Qt does the same "convert-to-the-local-code-page" stuff); that means we *do* need to call GetCommandLineW() and CommandLineToArgvW() in main() (i.e., we duplicate what Qt's WinMain() does, but converting to UTF-8 rather than to the local code page). Change-Id: I35b57c1b658fb3e9b0c685097afe324e9fe98649 Ping-Bug: 15151 Reviewed-on: https://code.wireshark.org/review/30051 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-07 17:06:00 +00:00
set(WILDCARD_OBJ wsetargv.obj)
CMake: wsetargv.obj is specific to Visual Studio
2021-07-14 02:10:25 +00:00
endif()
We should only link executables with setargv.obj. Libraries shouldn't be linked with it. See if this fixes the weird problems I'm having with mergecap - including, apparently, the mergecap from the buildbots - when run with wildcard arguments, terminating before it gets to main() (making it hard to try to debug bug 15151). Change-Id: Ie793b0ea8157186a121106636ac8b782457c09f5 Reviewed-on: https://code.wireshark.org/review/29985 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-02 20:33:02 +00:00
Do the LFS checks before processing any subdirectories. That's necessary in order to make sure that the required -D flags show up when building code from all subdirectories.
2021-03-23 02:13:34 +00:00
include(CheckSymbolExists)
#
# Large file support on UN*X, a/k/a LFS.
#
# On Windows, we require _fseeki64() and _ftelli64(). Visual
# Studio has had supported them since Visual Studio 2005/MSVCR80,
# and we require newer versions, so we know we have them.
#
if(NOT WIN32)
include(FindLFS)
if(LFS_FOUND)
#
# Add the required #defines.
#
add_definitions(${LFS_DEFINITIONS})
endif()
#
# Check for fseeko as well.
#
include(FindFseeko)
if(FSEEKO_FOUND)
set(HAVE_FSEEKO ON)
#
# Add the required #defines.
#
add_definitions(${FSEEKO_DEFINITIONS})
endif()
endif()
Qt: Add more version and packaging information to the main window. Add a "flavor" (for lack of a better word) banner, which can be set at build time via WIRESHARK_VERSION_FLAVOR / VERSION_FLAVOR. Set it to "Development Build" by default. This effectively migrates the "DEVELOPMENT VERSION" logo image text from the GTK+ UI. Add full release and automatic update information at the bottom. Remove the short version from the welcome banner (top left). To do: - Add back support for gui_version_placement. - Move the version and repository branch to the flavor label? - Add update links as appropriate to the bottom. - Clean up layout and spacing. Change-Id: I28af33e6c2beb855f803a2dfedef49f3e8389057 Reviewed-on: https://code.wireshark.org/review/7071 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-10 21:48:48 +00:00
# Banner shown at top right of Qt welcome screen.
if(DEFINED ENV{WIRESHARK_VERSION_FLAVOR})
set(VERSION_FLAVOR "$ENV{WIRESHARK_VERSION_FLAVOR}")
else()
set(VERSION_FLAVOR "Development Build")
endif()
CMake: Deduplicate some version variables. Use PROJECT_VERSION instead of VERSION. Prepend "PROJECT_" or "LOG_PROJECT_" as needed to other variables. Remove the leftover unused variables.
2022-06-07 22:51:24 +00:00
# Used in .rc files and manifests
CMake: Add a top-level nsis_package target. Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include file. Add macros to generate packaging-related targets and invoke them from the top-level CMakeLists.txt. Add a top-level "plugins" target. Copy plugins to "plugins" in each of our staging directories instead of "plugins/$VERSION". Add missing files to the copy_data_files and copy_cli_dlls targets. Add all files in the NSIS package from the staging directory. Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT. Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa Reviewed-on: https://code.wireshark.org/review/6459 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
set(RC_VERSION ${PROJECT_MAJOR_VERSION},${PROJECT_MINOR_VERSION},${PROJECT_PATCH_VERSION},${PROJECT_BUILD_VERSION})
CMake: Deduplicate some version variables. Use PROJECT_VERSION instead of VERSION. Prepend "PROJECT_" or "LOG_PROJECT_" as needed to other variables. Remove the leftover unused variables.
2022-06-07 22:51:24 +00:00
set(LOG_RC_VERSION ${LOG_PROJECT_MAJOR_VERSION},${LOG_PROJECT_MINOR_VERSION},${PROJECT_PATCH_VERSION},${PROJECT_BUILD_VERSION})
Fix CMake generation and use of Windows .rc files CMake now generates local copies of .rc files for all the Windows components and uses the files in the build of the components. The .rc.in files that include an icon were modified to allow the icon path to be set by CMake. The path is removed for nmake builds. Updated build architecture detection, required for wireshark.manifest.in Change-Id: I7b1ff43050e9b0efb861d1041636fb4aef49a4f8 Reviewed-on: https://code.wireshark.org/review/6482 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-10 21:29:57 +00:00
- Derive Wireshark version from configure.in for now. Allow to overide that version in CMakefile.txt - Minor update to README.cmake - Turn off GTK_DEBUG svn path=/trunk/; revision=32139
2010-03-07 19:40:25 +00:00
message(STATUS "V: ${PROJECT_VERSION}, MaV: ${PROJECT_MAJOR_VERSION}, MiV: ${PROJECT_MINOR_VERSION}, PL: ${PROJECT_PATCH_VERSION}, EV: ${PROJECT_VERSION_EXTENSION}.")
Small style changes. svn path=/trunk/; revision=53701
2013-12-01 21:55:21 +00:00
include(UseLemon)
Rename UseMakeDissectorReg.cmake Change-Id: I2723e7f0309dbe21f23b65818fbea3a7eadf13d4 Reviewed-on: https://code.wireshark.org/review/24514 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-11-20 19:58:46 +00:00
include(UseMakePluginReg)
Rewrite make-tap-reg.py in C Change-Id: Ief5b1fffecc9712c01ff10292c403b7c84a5908a Reviewed-on: https://code.wireshark.org/review/24756 Reviewed-by: João Valverde <j@v6e.pt>
2017-12-10 17:29:40 +00:00
include(UseMakeTaps)
Windows: Make our program details more consistent. Use a single template file for most of our program resources. Encode our resource files as UTF-8. Add resources to extcap/*.exe. Replace a regex with concatenation. Change-Id: I0ed49086618127ca4fdef69272f849d8f16e4dab Reviewed-on: https://code.wireshark.org/review/30088 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-08 23:34:39 +00:00
include(UseExecutableResources)
Small style changes. svn path=/trunk/; revision=53701
2013-12-01 21:55:21 +00:00
include(UseAsn2Wrs)
frederic.heem: Update/Add FindPCAP.cmake CMakeInstallDirs.cmake CMakeLists.txt me: Fix a typo, change gcc flags to mimic the behaviour of autofoo stuff. svn path=/trunk/; revision=19707
2006-10-26 15:36:50 +00:00
CMake: Fix eclipse indexer The indexer for eclipse gets confused, because CMake automatically adds __cplusplus=199711L which will lead to C-only files being parsed wrong, if a __cplusplus guard is being used. This has not interference with the code generation, just the __cplusplus definition is omitted Change-Id: I82aa770837668fbfbb5ac8227da1943e20b409fe Reviewed-on: https://code.wireshark.org/review/22506 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-07-04 08:22:34 +00:00
# The following snippet has been taken from
# https://github.com/USESystemEngineeringBV/cmake-eclipse-helper/wiki/HowToWorkaroundIndexer
# The eclipse indexer otherwise assumes __cplusplus=199711L which will lead to broken
# lookup tables for the epan libraries
# Check if CXX flags have been set to c++11 -> Setup Eclipse Indexer correctly!
# Also setup the project slightly different
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
if(CMAKE_EXTRA_GENERATOR MATCHES "Eclipse CDT4")
CMake: Fix eclipse indexer The indexer for eclipse gets confused, because CMake automatically adds __cplusplus=199711L which will lead to C-only files being parsed wrong, if a __cplusplus guard is being used. This has not interference with the code generation, just the __cplusplus definition is omitted Change-Id: I82aa770837668fbfbb5ac8227da1943e20b409fe Reviewed-on: https://code.wireshark.org/review/22506 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-07-04 08:22:34 +00:00
SET(CXX_ENABLED 0)
LIST(LENGTH CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS LIST_LEN)
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
if(LIST_LEN GREATER 0)
CMake: Fix eclipse indexer The indexer for eclipse gets confused, because CMake automatically adds __cplusplus=199711L which will lead to C-only files being parsed wrong, if a __cplusplus guard is being used. This has not interference with the code generation, just the __cplusplus definition is omitted Change-Id: I82aa770837668fbfbb5ac8227da1943e20b409fe Reviewed-on: https://code.wireshark.org/review/22506 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-07-04 08:22:34 +00:00
SET(CXX_ENABLED 1)
endif()
SET(C_ENABLED 0)
LIST(LENGTH CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS LIST_LEN)
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
if(LIST_LEN GREATER 0)
CMake: Fix eclipse indexer The indexer for eclipse gets confused, because CMake automatically adds __cplusplus=199711L which will lead to C-only files being parsed wrong, if a __cplusplus guard is being used. This has not interference with the code generation, just the __cplusplus definition is omitted Change-Id: I82aa770837668fbfbb5ac8227da1943e20b409fe Reviewed-on: https://code.wireshark.org/review/22506 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-07-04 08:22:34 +00:00
SET(C_ENABLED 1)
endif()
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
if(C_ENABLED EQUAL 1 AND CXX_ENABLED EQUAL 1)
CMake: Fix eclipse indexer The indexer for eclipse gets confused, because CMake automatically adds __cplusplus=199711L which will lead to C-only files being parsed wrong, if a __cplusplus guard is being used. This has not interference with the code generation, just the __cplusplus definition is omitted Change-Id: I82aa770837668fbfbb5ac8227da1943e20b409fe Reviewed-on: https://code.wireshark.org/review/22506 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-07-04 08:22:34 +00:00
# Combined project (C and CXX). This will confuse the indexer. For that reason
# we unsert set the __cplusplus variable for the indexer
list(FIND CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS "__cplusplus" GEN_MACRO_INDEX)
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
if(GEN_MACRO_INDEX GREATER -1)
CMake: Fix eclipse indexer The indexer for eclipse gets confused, because CMake automatically adds __cplusplus=199711L which will lead to C-only files being parsed wrong, if a __cplusplus guard is being used. This has not interference with the code generation, just the __cplusplus definition is omitted Change-Id: I82aa770837668fbfbb5ac8227da1943e20b409fe Reviewed-on: https://code.wireshark.org/review/22506 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-07-04 08:22:34 +00:00
list(REMOVE_AT CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS ${GEN_MACRO_INDEX})
list(REMOVE_AT CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS ${GEN_MACRO_INDEX})
endif()
SET(CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS ${CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS} CACHE INTERNAL "")
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
elseif((CXX_ENABLED EQUAL 1) AND (CMAKE_CXX_FLAGS MATCHES ".*-std=c\\+\\+11.*"))
CMake: Fix eclipse indexer The indexer for eclipse gets confused, because CMake automatically adds __cplusplus=199711L which will lead to C-only files being parsed wrong, if a __cplusplus guard is being used. This has not interference with the code generation, just the __cplusplus definition is omitted Change-Id: I82aa770837668fbfbb5ac8227da1943e20b409fe Reviewed-on: https://code.wireshark.org/review/22506 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-07-04 08:22:34 +00:00
#add_definitions (-D__cplusplus=201103L)
# CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS
list(FIND CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS "199711L" GEN_MACRO_INDEX)
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
if(GEN_MACRO_INDEX GREATER -1)
CMake: Fix eclipse indexer The indexer for eclipse gets confused, because CMake automatically adds __cplusplus=199711L which will lead to C-only files being parsed wrong, if a __cplusplus guard is being used. This has not interference with the code generation, just the __cplusplus definition is omitted Change-Id: I82aa770837668fbfbb5ac8227da1943e20b409fe Reviewed-on: https://code.wireshark.org/review/22506 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-07-04 08:22:34 +00:00
list(REMOVE_AT CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS ${GEN_MACRO_INDEX})
list(INSERT CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS ${GEN_MACRO_INDEX} "201103L")
SET(CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS ${CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS} CACHE INTERNAL "")
endif()
endif()
endif()
frederic.heem: Update/Add FindPCAP.cmake CMakeInstallDirs.cmake CMakeLists.txt me: Fix a typo, change gcc flags to mimic the behaviour of autofoo stuff. svn path=/trunk/; revision=19707
2006-10-26 15:36:50 +00:00
include_directories(
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}
Add an include sub-directory to the tree Blind attempt to fix Debian package brokenness managing headers separately from install rules. Global public headers that don't fit any of the Wireshark libraries should be placed in include/. Eventually the C files in the root dir should be placed somewhere else as well (like src/) but this is not a priority. Fixes #17726.
2021-11-11 18:09:22 +00:00
${CMAKE_SOURCE_DIR}/include
frederic.heem: Update/Add FindPCAP.cmake CMakeInstallDirs.cmake CMakeLists.txt me: Fix a typo, change gcc flags to mimic the behaviour of autofoo stuff. svn path=/trunk/; revision=19707
2006-10-26 15:36:50 +00:00
)
OK, as I haven't had any negative feedback, I'm adding my work to use cmake as a build system. It's in no way complete, I'd just like others to be able to participate in playing with cmake and to document what I'm doing. Please read the README.cmake for what can be done right now. svn path=/trunk/; revision=19149
2006-09-05 09:27:22 +00:00
Add option to specify special permissions for dumpcap during cmake phase: set(DUMPCAP_INSTALL_OPTION <val>) where val is one of "normal" "suid" "capabilities" Some things left to do: - Error out in cmake if setcap isn't found or libcap isn't found. - Move multivalue option handling into it's own macro (-file) with value checking svn path=/trunk/; revision=54840
2014-01-19 00:48:22 +00:00
if( DUMPCAP_INSTALL_OPTION STREQUAL "suid" )
set( DUMPCAP_SETUID "SETUID" )
else()
set( DUMPCAP_SETUID )
endif()
if( NOT CMAKE_SYSTEM_NAME STREQUAL "Linux" AND
DUMPCAP_INSTALL_OPTION STREQUAL "capabilities" )
message( WARNING "Capabilities are only supported on Linux" )
set( DUMPCAP_INSTALL_OPTION )
endif()
cmake: look for Qt5 from Homebrew on macOS When Qt5 is installed using Homebrew on macOS, Qt5 is not available in the default prefix. Remove the hack from macos-setup-brew.sh and adjust the search path instead. Note that is needed for development, "brew install" has already set this option in the environment. See https://github.com/Homebrew/homebrew-core/issues/8392 Change-Id: I57ea09b649a94c9a4cb18b1b2d334808e47ec27e Reviewed-on: https://code.wireshark.org/review/23232 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-08-27 13:39:50 +00:00
fuzzshark: integrate oss-fuzz targets in CMake The current fuzzshark target built by CMake is not usable for fuzzing. Address this by adding a new ENABLE_FUZZER option that enables mandatory instrumentation and libFuzzer linking options for the fuzzshark binary. Create more CMake targets for specific fuzzing targets such as fuzzshark_ip and fuzzshark_ip_proto-udp. These targets are not built by default, either build individual targets or use the all-fuzzers target. Now these binaries are not specific to oss-fuzz, so move them to a new directory (perhaps the corpora can be added here in the future). oss-fuzz build.sh is simplified and reuses the CMake targets. When OSS_FUZZ is set, it will force static linking with external libraries and limit parallel linker jobs (maybe not necessary for Google's oss-fuzz builders, but my 8G/6c VM ran out of memory). Change-Id: If3ba8f60ea1f5c3bd2131223050a81f9acbce05d Reviewed-on: https://code.wireshark.org/review/30228 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-16 22:47:20 +00:00
set(OSS_FUZZ OFF CACHE BOOL "Whether building for oss-fuzz")
mark_as_advanced(OSS_FUZZ)
if(OSS_FUZZ)
if(ENABLE_FUZZER)
# In oss-fuzz mode, the fuzzing engine can be afl or libFuzzer.
message(FATAL_ERROR "Cannot force libFuzzer when using oss-fuzz")
endif()
# Must not depend on external dependencies so statically link all libs.
CMake: add USE_STATIC option USE_STATIC will: - always link statically with external libraries (such as glib2) - will not set rpath to avoid the following error: CMake Error at cmake_install.cmake:50 (file): file RPATH_CHANGE could not write new RPATH: /usr/lib to the file: /home/fabrice/br-test-pkg/br-arm-full-static/target/usr/bin/tshark No valid ELF RPATH or RUNPATH entry exists in the file; Change-Id: I242dc1a091cc211ee891568a2dee5080c9974fba Ping-Bug: 15713 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Reviewed-on: https://code.wireshark.org/review/32945 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-22 16:39:52 +00:00
set(USE_STATIC ON)
endif()
if(USE_STATIC)
fuzzshark: integrate oss-fuzz targets in CMake The current fuzzshark target built by CMake is not usable for fuzzing. Address this by adding a new ENABLE_FUZZER option that enables mandatory instrumentation and libFuzzer linking options for the fuzzshark binary. Create more CMake targets for specific fuzzing targets such as fuzzshark_ip and fuzzshark_ip_proto-udp. These targets are not built by default, either build individual targets or use the all-fuzzers target. Now these binaries are not specific to oss-fuzz, so move them to a new directory (perhaps the corpora can be added here in the future). oss-fuzz build.sh is simplified and reuses the CMake targets. When OSS_FUZZ is set, it will force static linking with external libraries and limit parallel linker jobs (maybe not necessary for Google's oss-fuzz builders, but my 8G/6c VM ran out of memory). Change-Id: If3ba8f60ea1f5c3bd2131223050a81f9acbce05d Reviewed-on: https://code.wireshark.org/review/30228 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-16 22:47:20 +00:00
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
endif()
#
# Linking can consume a lot of memory, especially when built with ASAN and
# static libraries (like oss-fuzz) or Debug mode. With Ninja, the number of
# parallel linker processes is constrained by job parallelism (-j), but this can
# be reduced further by setting "job pools" to a lower number.
#
if(CMAKE_MAKE_PROGRAM MATCHES "ninja" AND OSS_FUZZ)
# Assume oss-fuzz linker jobs do not require more than 1.2G per task
set(per_job_memory_mb 1200)
cmake_host_system_information(RESULT total_memory_mb QUERY TOTAL_PHYSICAL_MEMORY)
math(EXPR parallel_link_jobs "${total_memory_mb} / ${per_job_memory_mb}")
if(parallel_link_jobs LESS 1)
set(parallel_link_jobs 1)
endif()
set_property(GLOBAL APPEND PROPERTY JOB_POOLS link_job_pool=${parallel_link_jobs})
set(CMAKE_JOB_POOL_LINK link_job_pool)
message(STATUS "Ninja job pool size: ${parallel_link_jobs}")
endif()
Try retroactively applying the Qt folks' fix for QTBUG-47942. The current version of the fix only adds -fPIC under certain circumstances; we check whether it was added and, if it was, and those circumstances are *not* in effect, we remove it. Bug: 11643 Change-Id: I75d0ff9b4781d7d4cd884a29bbce7d392939315c Reviewed-on: https://code.wireshark.org/review/11849 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-15 20:21:41 +00:00
# Always enable position-independent code when compiling, even for
# executables, so you can build position-independent executables.
CMake: silence CMP0083 warning from future CMake 3.14 The current development version of CMake started emitting warnings due to the use of CMAKE_POSITION_INDEPENDENT_CODE without setting CMP0083. Change-Id: Id6747c00fea7a1d28e5ba900ba4578fe89f40f83 Reviewed-on: https://code.wireshark.org/review/31579 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-17 18:34:37 +00:00
# -pie is added below for non-MSVC, but requires objects to be built with
# -fPIC/-fPIE (so set CMAKE_POSITION_INDEPENDENT_CODE to enable that).
cmake: avoid adding -fPIE to libraries (fixes gcc 4.7) On Debian Wheezy, the cmake build would fail with: /usr/bin/ld: CMakeFiles/wsutil.dir/privileges.c.o: relocation R_X86_64_PC32 against symbol `started_with_special_privs' can not be used when making a shared object; recompile with -fPIC Issue was introduced with v1.99.10rc0-222-g3fb1d68 ("cmake: Enable PIE when it is available by default"). Bug: 11587 Change-Id: I62eec8d1db020128eeeb77b38e3316abf71e6e6a Reviewed-on: https://code.wireshark.org/review/10916 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-10-09 21:43:02 +00:00
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
CMake: Rewrite preprocessor definitions again
2021-05-24 17:10:46 +00:00
# Preprocessor definitions common to all compilers
set_property(DIRECTORY
PROPERTY COMPILE_DEFINITIONS
"G_DISABLE_DEPRECATED"
"G_DISABLE_SINGLE_INCLUDES"
CMake: Use more consistent naming for options Having some options use DISABLE_ and others ENABLE_ is inconsistent and difficult to remember. Use ENABLE_ instead consistently. Frame-larger-than remains an exception.
2021-12-30 01:05:57 +00:00
$<$<OR:$<NOT:$<BOOL:${ENABLE_ASSERT}>>,$<CONFIG:Release>>:WS_DISABLE_ASSERT>
$<$<OR:$<NOT:$<BOOL:${ENABLE_DEBUG}>>,$<CONFIG:Release>>:WS_DISABLE_DEBUG>
CMake: Rewrite preprocessor definitions again
2021-05-24 17:10:46 +00:00
)
CMake: Fix macro redefinition of Windows API versioning
2021-09-20 17:54:54 +00:00
if(WIN32)
#
# NOTE: Because of the way Qt moc is including "config.h" (not as the
# first header) this *MUST* be defined on the command line to precede
# every included header and not trigger symbol redefinition errors.
#
add_definitions(
MinGW-w64: Need to define WIN32_LEAN_AND_MEAN
2021-07-14 02:17:28 +00:00
-DWIN32_LEAN_AND_MEAN
#
CMake: Move UNICODE defines to command line For consistency's sake, I have not had any build errors that can be attributed to this.
2021-09-20 22:32:38 +00:00
# Use Unicode in Windows runtime functions.
#
-DUNICODE
-D_UNICODE
#
MinGW-w64: Define NOMINMAX for Windows API This seems relevant to MinGW-w64 from a quick look at the source.
2021-09-20 21:42:25 +00:00
# NOMINMAX keeps windows.h from defining "min" and "max" via windef.h.
# This avoids conflicts with the C++ standard library.
#
-DNOMINMAX
#
MinGW-w64: Need to define WIN32_LEAN_AND_MEAN
2021-07-14 02:17:28 +00:00
# Make sure everyone is using the same API and that it's sufficient
# for our needs.
# This should match the following:
Rename the "image" directory to "resources". The "image" directory contains resource compiler assets and other application resources, so name it "resources."
2022-03-06 22:16:36 +00:00
# - The <compatibility><application> section in resources\wireshark.exe.manifest.in
MinGW-w64: Need to define WIN32_LEAN_AND_MEAN
2021-07-14 02:17:28 +00:00
# - The GetWindowsVersion parts of packaging\nsis\wireshark.nsi
# - The VersionNT parts of packaging\wix\Prerequisites.wxi
#
CMake: Fix macro redefinition of Windows API versioning
2021-09-20 17:54:54 +00:00
-DNTDDI_VERSION=NTDDI_WIN7
-D_WIN32_WINNT=_WIN32_WINNT_WIN7
)
endif()
MinGW-w64: Need to use ANSI C stdio Defining _POSIX enables __USE_MINGW_ANSI_STDIO, this switches the stdio API from Microsoft to MinGW internal (ANSI C).
2021-09-22 03:26:21 +00:00
if(MINGW)
add_definitions(
#
# Enable POSIX APIs. This will switch stdio to ANSI C functions and
# enable C99 conformant vsnprintf() among other things.
#
-D_POSIX
)
CMake: Try to set a required try_run() definition in a more idiomatic way This is applicable to every test (if we had more), not just HAVE_C99_VSNPRINTF. Could also be a #define but let's go with this for now. This takes advantage of the stack based design of CMakePushCheckState.
2021-09-22 14:57:43 +00:00
list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_POSIX)
MinGW-w64: Need to use ANSI C stdio Defining _POSIX enables __USE_MINGW_ANSI_STDIO, this switches the stdio API from Microsoft to MinGW internal (ANSI C).
2021-09-22 03:26:21 +00:00
endif()
Beginnings of win cmake support (not yet working), created by Graham Bloice, some smaller changes by me. - README.cmake Document how to (one day) run on Windows - CMakeLists.txt Use MSVC compiler flags for MSVC instead of gcc flags - FindWSWinLibs.cmake New: Creates HINTS for finding includes and libraries inside the Wireshark support library installation. - FindXXX.cmake Make use of HINTS generated by FindWSWinLibs.cmake This has not really been tested on Windows as my installation seems to have automagically downloaded some fixes and is in an inconsistent state since. Will probably need to reinstall. svn path=/trunk/; revision=52194
2013-09-23 21:45:55 +00:00
if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
CMake: Be stricter about MSVC requirements
2021-12-16 11:58:44 +00:00
if (MSVC_VERSION LESS "1928")
message(FATAL_ERROR "Microsoft Visual Studio 2019 version 16.8 or later is required")
endif()
if (MSVC_VERSION GREATER_EQUAL "2000")
Graham Bloice Ensure we use the correct value for MSC_VER_REQUIRED (similar to nmake build) svn path=/trunk/; revision=53656
2013-11-29 21:07:23 +00:00
message(FATAL_ERROR "You are using an unsupported version of MSVC")
endif()
Separate Windows CMake compiler definitions and flags Change-Id: I70af6d43f45e2110ee7707ff5747b5e990ba7238 Reviewed-on: https://code.wireshark.org/review/8926 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-06-15 12:14:01 +00:00
add_definitions(
Fix indent (use tabs) svn path=/trunk/; revision=53390
2013-11-17 14:03:58 +00:00
/D_CRT_SECURE_NO_DEPRECATE
Add flags required for VS2013 to Cmake Change-Id: I666d819fdee67d945dd46bd03749f190eb2873b4 Reviewed-on: https://code.wireshark.org/review/2499 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2014-06-20 21:59:29 +00:00
# -DPSAPI_VERSION=1 Programs that must run on earlier versions of Windows as well as Windows 7 and later
# versions should always call this function as GetProcessMemoryInfo. To ensure correct
# resolution of symbols, add Psapi.lib to the TARGETLIBS macro and compile the program
# with -DPSAPI_VERSION=1.To use run-time dynamic linking, load Psapi.dll.
HTTPS In More Places, update some URLs. Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8 Reviewed-on: https://code.wireshark.org/review/34096 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-27 07:54:44 +00:00
# https://docs.microsoft.com/en-us/windows/win32/api/psapi/nf-psapi-getprocessmemoryinfo
Add flags required for VS2013 to Cmake Change-Id: I666d819fdee67d945dd46bd03749f190eb2873b4 Reviewed-on: https://code.wireshark.org/review/2499 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2014-06-20 21:59:29 +00:00
# -D_ALLOW_KEYWORD_MACROS For VS2012 onwards the, C++ STL does not permit macro redefinitions of keywords
HTTPS In More Places, update some URLs. Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8 Reviewed-on: https://code.wireshark.org/review/34096 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-27 07:54:44 +00:00
# (see https://docs.microsoft.com/en-us/previous-versions/visualstudio/visual-studio-2012/bb531344(v=vs.110))
Add flags required for VS2013 to Cmake Change-Id: I666d819fdee67d945dd46bd03749f190eb2873b4 Reviewed-on: https://code.wireshark.org/review/2499 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2014-06-20 21:59:29 +00:00
# This definition prevents the complaint about the redefinition of inline by WinPCap
Use CMake conventional nomenclature for CXX_FLAGS Change-Id: I2b67eed2bb04412b9d556e616fe3233176fac5bc Reviewed-on: https://code.wireshark.org/review/13883 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-10 12:52:58 +00:00
# in pcap-stdinc.h when compiling C++ files, e.g. the Qt UI
Add flags required for VS2013 to Cmake Change-Id: I666d819fdee67d945dd46bd03749f190eb2873b4 Reviewed-on: https://code.wireshark.org/review/2499 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2014-06-20 21:59:29 +00:00
/DPSAPI_VERSION=1
/D_ALLOW_KEYWORD_MACROS
MinGW-w64: Add guards for MSVC macro definitions Add a comment too.
2021-09-21 09:02:41 +00:00
# Disable deprecation of POSIX function names.
wslog: Use plain format with "message" level Try out a simpler format with the default log level. Don't display process and file/function information with "message" level (experimental).
2021-06-16 00:07:37 +00:00
# https://stackoverflow.com/questions/37845163/what-is-the-purpose-of-microsofts-underscore-c-functions
/D_CRT_NONSTDC_NO_WARNINGS
Fix indent (use tabs) svn path=/trunk/; revision=53390
2013-11-17 14:03:58 +00:00
)
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
if(NOT WIRESHARK_TARGET_PLATFORM STREQUAL "win64")
Separate Windows CMake compiler definitions and flags Change-Id: I70af6d43f45e2110ee7707ff5747b5e990ba7238 Reviewed-on: https://code.wireshark.org/review/8926 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-06-15 12:14:01 +00:00
add_definitions("/D_BIND_TO_CURRENT_CRT_VERSION=1")
endif()
set(LOCAL_CFLAGS
/MP
)
CMake: Compile and link flag updates. Add /guard:cf and /Qspectre to the Visual C++ 2015 compile and link flags. Don't bother trying to pass -Wl,--as-needed or -pie to Visual C++. Remove some unneeded quotes. Change-Id: I4d89d61ce9dd579e7cfbcd49df6116810bfb0178 Reviewed-on: https://code.wireshark.org/review/25356 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-16 21:56:58 +00:00
set(WS_LINK_FLAGS "/LARGEADDRESSAWARE /MANIFEST:NO /INCREMENTAL:NO /RELEASE")
HTTPS In More Places, update some URLs. Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8 Reviewed-on: https://code.wireshark.org/review/34096 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-27 07:54:44 +00:00
# To do: Add /external:... See https://devblogs.microsoft.com/cppblog/broken-warnings-theory/
Remove older Visual Studio suport. Remove conditional checks for Visual Studio 2013 and earlier from CMakeLists.txt. Remove the VSVersion flag from win-setup.ps1. We haven't used it in quite a while. Change-Id: Iea80f8cd566f4909e1bac2d0a620488255c4d0a7 Reviewed-on: https://code.wireshark.org/review/27607 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-16 23:35:12 +00:00
#
CMake: Pass /diagnostics:caret to Visual C++. Pass /diagnostics:caret to Visual C++ so in order to bring us in line with Clang and gcc.
2021-04-14 18:41:23 +00:00
# /diagnostics:caret Place a caret under compilation issues similar to
# Clang and gcc.
Remove older Visual Studio suport. Remove conditional checks for Visual Studio 2013 and earlier from CMakeLists.txt. Remove the VSVersion flag from win-setup.ps1. We haven't used it in quite a while. Change-Id: Iea80f8cd566f4909e1bac2d0a620488255c4d0a7 Reviewed-on: https://code.wireshark.org/review/27607 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-16 23:35:12 +00:00
# /Zo Enhanced debugging of optimised code
# /utf-8 Set Source and Executable character sets to UTF-8
# VS2015(MSVC14): On by default when /Zi or /Z7 used.
# /guard:cf Control Flow Guard (compile and link).
HTTPS In More Places, update some URLs. Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8 Reviewed-on: https://code.wireshark.org/review/34096 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-27 07:54:44 +00:00
# See https://docs.microsoft.com/en-us/windows/win32/secbp/control-flow-guard
Remove older Visual Studio suport. Remove conditional checks for Visual Studio 2013 and earlier from CMakeLists.txt. Remove the VSVersion flag from win-setup.ps1. We haven't used it in quite a while. Change-Id: Iea80f8cd566f4909e1bac2d0a620488255c4d0a7 Reviewed-on: https://code.wireshark.org/review/27607 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-16 23:35:12 +00:00
# Note: This requires CMake 3.9.0 or newer.
# https://gitlab.kitware.com/cmake/cmake/commit/f973d49ab9d4c59b93f6dac812a94bb130200836
# /Qspectre Speculative execution attack mitigation
HTTPS In More Places, update some URLs. Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8 Reviewed-on: https://code.wireshark.org/review/34096 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-27 07:54:44 +00:00
# See https://devblogs.microsoft.com/cppblog/spectre-mitigations-in-msvc/
CMake: Pass /diagnostics:caret to Visual C++. Pass /diagnostics:caret to Visual C++ so in order to bring us in line with Clang and gcc.
2021-04-14 18:41:23 +00:00
list(APPEND LOCAL_CFLAGS /diagnostics:caret /Zo /utf-8 /guard:cf)
Remove older Visual Studio suport. Remove conditional checks for Visual Studio 2013 and earlier from CMakeLists.txt. Remove the VSVersion flag from win-setup.ps1. We haven't used it in quite a while. Change-Id: Iea80f8cd566f4909e1bac2d0a620488255c4d0a7 Reviewed-on: https://code.wireshark.org/review/27607 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-16 23:35:12 +00:00
set(WS_LINK_FLAGS "${WS_LINK_FLAGS} /guard:cf")
# /Qspectre is not available for VS2015 or older VS2017. Test for its availability.
set(WIRESHARK_COMMON_FLAGS /Qspectre)
Windows build improvements: Added /Zo flag for VS2013 builds to add more debugging info Removed obsolete comment on unused /GS flag and obsolete /FR flag. Removed '#ifdef WIRESHARK_GENERATE_BSC_FILE' and related (which specified the obsolete /FR flag). Added /RELEASE flag to linker to set checksum in PE header Fixed an old typo. CMake added /INCREMENTAL:NO flag to linker to overide default and prevent warning messages. Change-Id: I039b884657d2886acc273dc6dd099d07a7b8ec7d Reviewed-on: https://code.wireshark.org/review/6110 Reviewed-by: Bill Meier <wmeier@newsguy.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-27 08:37:11 +00:00
CMake: Add an ENABLE_CODE_ANALYSIS option. Currently Visual Studio-only. Enabling it adds /analyze:WX- to LOCAL_CFLAGS, similar to config.nmake. Change-Id: Ida68831e85f5f04b9f84faa95a39fed24e5f490d Reviewed-on: https://code.wireshark.org/review/6346 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 18:44:37 +00:00
if(ENABLE_CODE_ANALYSIS)
CMake: Add a note about setting CAExcludePath. Visual Studio's code analyzer lets you avoid analyzing external headers using CAExcludePath. Add a note suggesting that we might want to do this using the VS_USER_PROPS CMake property, but that for now we're using an environment variable in the builder config.
2021-02-16 19:03:35 +00:00
# We should probably add a code_analysis.props file and use it to set
# CAExcludePath, otherwise we trigger on Qt's headers:
# https://stackoverflow.com/questions/59669026/how-to-add-property-to-affect-code-analysis-in-cmake
# https://gitlab.kitware.com/cmake/cmake/-/issues/19682
# For now, we set CAExcludePath=C:\Qt;%include% in the Visual Studio
# Code Analys builder's environment.
Trust CMake's Visual C++ version detection. We can be reasonably certain that CMake sets CMAKE_C_COMPILER_ID, MSVC12 and MSVC14 correctly. If we add a compiler flag based on those variables don't bother passing it through check_c_compiler_flag or check_cxx_compiler_flag. This speeds up CMake here quite a bit. Change-Id: I3a681a8a9287b33353030fd37303aa32f04b79a9 Reviewed-on: https://code.wireshark.org/review/26475 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-14 16:20:16 +00:00
list(APPEND LOCAL_CFLAGS /analyze:WX-)
CMake: Add an ENABLE_CODE_ANALYSIS option. Currently Visual Studio-only. Enabling it adds /analyze:WX- to LOCAL_CFLAGS, similar to config.nmake. Change-Id: Ida68831e85f5f04b9f84faa95a39fed24e5f490d Reviewed-on: https://code.wireshark.org/review/6346 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 18:44:37 +00:00
endif()
Fix indent (use tabs) svn path=/trunk/; revision=53390
2013-11-17 14:03:58 +00:00
# Additional compiler warnings to be treated as "Level 3"
Trust CMake's Visual C++ version detection. We can be reasonably certain that CMake sets CMAKE_C_COMPILER_ID, MSVC12 and MSVC14 correctly. If we add a compiler flag based on those variables don't bother passing it through check_c_compiler_flag or check_cxx_compiler_flag. This speeds up CMake here quite a bit. Change-Id: I3a681a8a9287b33353030fd37303aa32f04b79a9 Reviewed-on: https://code.wireshark.org/review/26475 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-14 16:20:16 +00:00
# when compiling Wireshark sources. (Selected from "level 4" warnings).
Fix indent (use tabs) svn path=/trunk/; revision=53390
2013-11-17 14:03:58 +00:00
## 4295: array is too small to include a terminating null character
MSVC: Warn about unused formal parameters Provide _U_ macro definition for Visual Studio. Change the way _U_ macro is ifdefed for some targets to allow Visual Studio to recognize it. Ping-Bug: 15832 Change-Id: Ic7ce145cbe9e8aa751d64c9c09ce8ba6c1bbbd30 Reviewed-on: https://code.wireshark.org/review/34530 Tested-by: Petri Dish Buildbot Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-09-15 09:25:18 +00:00
## 4100: unreferenced formal parameter
In Visual Studio builds, enable the L4 warning 4189: Local variable is initialized but not referenced Fix some variables found by this Change-Id: Icc13def5413f1fe885ec25e659462c8906a6cfa0 Reviewed-on: https://code.wireshark.org/review/3748 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-20 12:31:19 +00:00
## 4189: local variable is initialized but not referenced
Fix more repeated words throughout Fixes more repeated words seen throughout the code base.
2021-12-31 03:03:45 +00:00
# Disable warnings about use of flexible array members:
Allow a lot more C99 features Flexible array members are supported by gcc, clang and even MSVC2013. Note, so far it was only used in the Windows-specific airpcap.h. Trailing commas in enum declaration are already in use since for these dissectors (commit ID is the first occurrence): epan/dissectors/packet-gluster.h v2.1.0rc0-1070-g3b706ba epan/dissectors/packet-ipv6.c v2.1.2rc0-81-ge07b4aa epan/dissectors/packet-netlink.h v2.3.0rc0-389-gc0ab12b epan/dissectors/packet-netlink-netfilter.c v2.3.0rc0-239-g1767e08 epan/dissectors/packet-netlink-route.c v2.3.0rc0-233-g2a80b40 epan/dissectors/packet-quic.c v2.3.0rc0-457-gfa320f8 Inline functions using the "inline" keyword are supported via all glib versions we support (if it is missing, glib will define a suitable inline macro). Other c99 functions listed in the README.developer document were found to be compatible with GCC 4.4.7, Clang 3.4.2 and MSVC 2013. Change-Id: If5bab03bfd8577b15a24bedf08c03bdfbf34317a Reviewed-on: https://code.wireshark.org/review/17421 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31 13:58:20 +00:00
## 4200: nonstandard extension used : zero-sized array in struct/union
MSVC: Warn about unused formal parameters Provide _U_ macro definition for Visual Studio. Change the way _U_ macro is ifdefed for some targets to allow Visual Studio to recognize it. Ping-Bug: 15832 Change-Id: Ic7ce145cbe9e8aa751d64c9c09ce8ba6c1bbbd30 Reviewed-on: https://code.wireshark.org/review/34530 Tested-by: Petri Dish Buildbot Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-09-15 09:25:18 +00:00
list(APPEND LOCAL_CFLAGS /w34295 /w34100 /w34189 /wd4200)
Trust CMake's Visual C++ version detection. We can be reasonably certain that CMake sets CMAKE_C_COMPILER_ID, MSVC12 and MSVC14 correctly. If we add a compiler flag based on those variables don't bother passing it through check_c_compiler_flag or check_cxx_compiler_flag. This speeds up CMake here quite a bit. Change-Id: I3a681a8a9287b33353030fd37303aa32f04b79a9 Reviewed-on: https://code.wireshark.org/review/26475 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-14 16:20:16 +00:00
CMake: Update a Windows SDK version check. C11 support requires a newer Windows SDK. Add version checks and workarounds as needed. Remove a redundant CMAKE_C_COMPILER_ID check. Add a description of C5105 to match our other warning adjustments.
2021-12-15 16:37:38 +00:00
# MSVC 14.28 + C11 enables C5105, but older Windows SDKs aren't completely compatible.
# Windows SDK 10.0.17763.0 generates syntax errors with C11 enabled.
if (CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION VERSION_LESS 10.0.18362.0)
CMake: Be stricter about MSVC requirements
2021-12-16 11:58:44 +00:00
message(FATAL_ERROR "Windows SDK ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION} doesn't support C11. Please make sure you're using 10.0.20348.0 or later.")
CMake: Update a Windows SDK version check. C11 support requires a newer Windows SDK. Add version checks and workarounds as needed. Remove a redundant CMAKE_C_COMPILER_ID check. Add a description of C5105 to match our other warning adjustments.
2021-12-15 16:37:38 +00:00
endif()
# Windows SDK 10.0.18362.0 to 10.0.19041.685 generate warning C5105 with C11 enabled.
if(CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION VERSION_LESS 10.0.20348.0)
CMake: Be stricter about MSVC requirements
2021-12-16 11:58:44 +00:00
message(WARNING "Windows SDK ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION} doesn't support C11. Please make sure you're using 10.0.20348.0 or later.")
CMake: Update a Windows SDK version check. C11 support requires a newer Windows SDK. Add version checks and workarounds as needed. Remove a redundant CMAKE_C_COMPILER_ID check. Add a description of C5105 to match our other warning adjustments.
2021-12-15 16:37:38 +00:00
## 5105: macro expansion producing 'defined' has undefined behavior
list(APPEND LOCAL_CFLAGS /wd5105)
CMake: Use CMAKE_C_STANDARD to require C11 Related to #17768.
2021-12-14 23:47:30 +00:00
endif()
Trust CMake's Visual C++ version detection. We can be reasonably certain that CMake sets CMAKE_C_COMPILER_ID, MSVC12 and MSVC14 correctly. If we add a compiler flag based on those variables don't bother passing it through check_c_compiler_flag or check_cxx_compiler_flag. This speeds up CMake here quite a bit. Change-Id: I3a681a8a9287b33353030fd37303aa32f04b79a9 Reviewed-on: https://code.wireshark.org/review/26475 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-14 16:20:16 +00:00
# We've matched these to specific compiler versions using the
# checks above. There's no need to pass them to check_c_compiler_flag
# or check_cxx_compiler_flag, which can be slow.
string(REPLACE ";" " " _flags "${LOCAL_CFLAGS}")
set(CMAKE_C_FLAGS "${_flags} ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${_flags} ${CMAKE_CXX_FLAGS}")
Remove Windows linker flags from the CMake link flags test as the test doesn't actually pass the flags to the VS linker. Change-Id: I5d546afcb80a49e39143078bc8f0855b0ba0f7e8 Reviewed-on: https://code.wireshark.org/review/5384 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-11-18 15:59:44 +00:00
CMake: Compile and link flag updates. Add /guard:cf and /Qspectre to the Visual C++ 2015 compile and link flags. Don't bother trying to pass -Wl,--as-needed or -pie to Visual C++. Remove some unneeded quotes. Change-Id: I4d89d61ce9dd579e7cfbcd49df6116810bfb0178 Reviewed-on: https://code.wireshark.org/review/25356 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-16 21:56:58 +00:00
else() # ! MSVC
CMake: Make sure we use the same minimum macOS version everywhere. Add a MIN_MACOS_VERSION variable. Update it and sanity check it according to CMAKE_OSX_DEPLOYMENT_TARGET and our Qt version. Use it to set our minimum macOS version in various places. Change-Id: Icaf0dbe463f34d182986868021e2b56d2239da38 Reviewed-on: https://code.wireshark.org/review/31048 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-14 19:30:39 +00:00
if(APPLE)
CMake: macOS version updates. Set MIN_MACOS_VERSION to 10.14 if we're building with Qt 6.0 or later. Print both our deployment target and our base SDK at configure time.
2020-12-19 19:23:57 +00:00
# MIN_MACOS_VERSION is used to set LSMinimumSystemVersion
# in Info.plist, so start with something low.
Require Qt 5.9 or later Increase the minimum required version of Qt from 5.6 to the next LTS version, 5.9. The various Linux distributions that have not released an update to 5.9 or later (SLES 12, Debian stretch) are nearing end of support, and can be supported by the Wireshark 3.6 LTS release. Qt 5.9 requires macOS 10.0, so make that the minimum macOS version as well. Remove unneeded version checks (except from QCustomPlot).
2022-04-20 22:59:32 +00:00
set(MIN_MACOS_VERSION 10.10)
CMake: Make sure we use the same minimum macOS version everywhere. Add a MIN_MACOS_VERSION variable. Update it and sanity check it according to CMAKE_OSX_DEPLOYMENT_TARGET and our Qt version. Use it to set our minimum macOS version in various places. Change-Id: Icaf0dbe463f34d182986868021e2b56d2239da38 Reviewed-on: https://code.wireshark.org/review/31048 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-14 19:30:39 +00:00
if(CMAKE_OSX_DEPLOYMENT_TARGET)
if(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS MIN_MACOS_VERSION)
message(FATAL_ERROR "We don't support building for macOS < ${MIN_MACOS_VERSION}")
Add an OSX_DEPLOY_TARGET option to control building for a target OS version. It should be set to an OS version, such as "10.5" or "10.6" or..., and, if set (and if you're building for "APPLE"), it'll try to find the SDK (and fail if it's not found), and add appropriate -isysroot, -mmacosx-version-min, and, if appropriate, -m32 compiler options. (It will need more work once we support building OS X app bundles and installers; pick up more stuff from configure.ac for that.) Change-Id: I0aebf2db8aa39304a41be4e2a9879dea6f308ec7 Reviewed-on: https://code.wireshark.org/review/3388 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-03 20:07:46 +00:00
endif()
CMake: Make sure we use the same minimum macOS version everywhere. Add a MIN_MACOS_VERSION variable. Update it and sanity check it according to CMAKE_OSX_DEPLOYMENT_TARGET and our Qt version. Use it to set our minimum macOS version in various places. Change-Id: Icaf0dbe463f34d182986868021e2b56d2239da38 Reviewed-on: https://code.wireshark.org/review/31048 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-14 19:30:39 +00:00
set(MIN_MACOS_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET})
Add an OSX_DEPLOY_TARGET option to control building for a target OS version. It should be set to an OS version, such as "10.5" or "10.6" or..., and, if set (and if you're building for "APPLE"), it'll try to find the SDK (and fail if it's not found), and add appropriate -isysroot, -mmacosx-version-min, and, if appropriate, -m32 compiler options. (It will need more work once we support building OS X app bundles and installers; pick up more stuff from configure.ac for that.) Change-Id: I0aebf2db8aa39304a41be4e2a9879dea6f308ec7 Reviewed-on: https://code.wireshark.org/review/3388 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-03 20:07:46 +00:00
endif()
endif()
CMake: Allow setting per target compiler warnings Setting our compiler warning flags in CMAKE_C_FLAGS does not allow using different flags per target. Allow for that possibility by setting the internal WS_WARNINGS_{C,CXX}_FLAGS and using the COMPILE_OPTIONS property to set them. This change is just setting mechanism and there should be no difference in generated warnings. The check_X_compiler_flag cmake test is changed to test each flag individually. We need a list, not a space separated string, and the aggregate test is not significant. Change-Id: I59fc5cd7e130c7a5e001c598e3df3e13f83a6a25 Reviewed-on: https://code.wireshark.org/review/17150 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-08-16 21:21:59 +00:00
if(CMAKE_C_COMPILER_ID MATCHES "Clang")
set(WIRESHARK_COMMON_FLAGS ${WIRESHARK_COMMON_FLAGS}
# avoid "argument unused during compilation" warnings
# (for example, when getting the -gsplit-dwarf option or
# when combining -fwrapv with -fno-strict-overflow)
-Qunused-arguments
)
else()
set(WIRESHARK_COMMON_FLAGS ${WIRESHARK_COMMON_FLAGS}
-fexcess-precision=fast
)
endif()
CMake: Remove some redundant and overly verbose code The original reason for having a WARN_FLAGS set of variables has been lost. Change-Id: I3eae3cf9d0bad5f3895f6fee59c2c64183c8f244 Reviewed-on: https://code.wireshark.org/review/29526 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-10 00:13:56 +00:00
list(APPEND WIRESHARK_COMMON_FLAGS
Note that the ...COMMON_FLAGS are for C and C++. Change-Id: I0ef87b3b4aaed984a8a53660b36746345626583a Reviewed-on: https://code.wireshark.org/review/3373 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-02 23:26:50 +00:00
# The following are for C and C++
Fix indent (use tabs) svn path=/trunk/; revision=53390
2013-11-17 14:03:58 +00:00
# -O<X> and -g get set by the CMAKE_BUILD_TYPE
-Wall
-Wextra
-Wendif-labels
-Wpointer-arith
-Wformat-security
OK, try sorting the compiler options. Also, comment out the addition of -Wno-deprecated-declarations, as the CMake build doesn't use it. If this succeeds in making the autotools and CMake builds compile C code with the same -W and -f flags in the same order, that should eliminate at least one reason why the CMake build produces compiler warnings that the autotools build doesn't. Change-Id: I0eaeae91b8e3c39c53f502daef86c2d103c8bdab Reviewed-on: https://code.wireshark.org/review/3374 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-03 00:46:32 +00:00
-fwrapv
-fno-strict-overflow
Fix indent (use tabs) svn path=/trunk/; revision=53390
2013-11-17 14:03:58 +00:00
-Wvla
-Waddress
-Wattributes
-Wdiv-by-zero
-Wignored-qualifiers
Don't distinguish between "GCC" and "Clang" extra -W flags. We test whether a given compiler supports a given -W flag, so we don't need to separate them and check them only for particular compilers. To make that even clearer, rename the --enable option from --enable-extra-gcc-checks to --enable-extra-compiler-checks, and document it as just "do additional -W checks", and rename the WIRESHARK_EXTRA_GCC_ CMake variables to WIRESHARK_EXTRA_COMPILER_. Sync up the lists of warning flags in CMake with the lists in autoconf. Uncomment -Wdocumentation while we're at it. If it doesn't work *at all*, comment it out until it's fixed, or, better yet, fix it; if it still produces warnings, we just leave it among the "extra" flags. Change-Id: I4042affdade612e4025e2881d08f1ca69d759626 Reviewed-on: https://code.wireshark.org/review/1226 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-20 22:44:53 +00:00
-Wpragmas
Fix indent (use tabs) svn path=/trunk/; revision=53390
2013-11-17 14:03:58 +00:00
-Wno-overlength-strings
-Wno-long-long
Don't distinguish between "GCC" and "Clang" extra -W flags. We test whether a given compiler supports a given -W flag, so we don't need to separate them and check them only for particular compilers. To make that even clearer, rename the --enable option from --enable-extra-gcc-checks to --enable-extra-compiler-checks, and document it as just "do additional -W checks", and rename the WIRESHARK_EXTRA_GCC_ CMake variables to WIRESHARK_EXTRA_COMPILER_. Sync up the lists of warning flags in CMake with the lists in autoconf. Uncomment -Wdocumentation while we're at it. If it doesn't work *at all*, comment it out until it's fixed, or, better yet, fix it; if it still produces warnings, we just leave it among the "extra" flags. Change-Id: I4042affdade612e4025e2881d08f1ca69d759626 Reviewed-on: https://code.wireshark.org/review/1226 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-20 22:44:53 +00:00
-Wheader-guard
More selectively prevent warnings from becoming errors. Always use -Werror if it's supported, even with Apple's llvm-gcc, and only use -Wno-error= with llvm-gcc. Use -Wno-error= with all the errors we get in the buildbot. Change-Id: I6797f064d2d354f979e24fcb04f592e9313af721 Reviewed-on: https://code.wireshark.org/review/29612 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11 19:42:34 +00:00
-Wcomma
Don't use -Werror with Apple's llvm-gcc. Its handling of warnings, and of warnings-treated-as-errors, is horribly broken; once you've asked for a warning, and have specified -Werror, there appears to be nothing whatsoever that you can do to keep that warning from being an error *everywhere* in the code. Prior to change Ib591a1d6beaa13337d927a446b4d8d5e687ff610, the tests for warnings were all failing on the macOS buildbot, so *no* warnings were being requested. With this change, a warning won't be reported as an error, but at least it'll be reported. (We should probably switch to using Clang on the macOS buildbot at some point; I don't know whether the version of Clang currently on the buildbot is safe to use, but if we ever run a newer version of Xcode, which doesn't come with llvm-gcc - which may involve running a newer version of macOS on the buildbot as well - it's presumably safe, given that it's the only compiler Apple shipped.) Change-Id: I677967cb87b91f68f08de546e59abff1dbd6788b Reviewed-on: https://code.wireshark.org/review/29623 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-12 04:02:56 +00:00
-Wshorten-64-to-32
Enable -Wredundant-decls. Add it to the default list of checks, and fix some errors it causes. (Sadly, it doesn't work in CLang.)
2021-02-14 20:54:42 +00:00
-Wredundant-decls
CMake: Make -Wmaybe-uninitialized non-fatal
2021-11-01 21:44:10 +00:00
#
# -Wmaybe-uninitialized is enabled with -Wall. This is a low
# priority warning, sometimes with false positives, that
# can lay dormant and be triggered by increasing the optimization
# level to O3. This is a major inconvenience for developers
# (because the warning is typically unrelated to their code)
# and for end users it is a build breakage (with -Werror).
# For these reasons we disable the fatal error for this warning,
# until these procedural issues can be fixed or at least mitigated.
#
-Wno-error=maybe-uninitialized
CMake: Disable errors with -Walloc-size-larger-than= This seems to be buggy and have a complicated interaction with the GCC optimizer. Disable hard failures so we can focus on actual issues and deal with dormant false positives when it is convenient. Ping #18089
2022-05-23 12:23:42 +00:00
# Disable errors for another warning that is prone to guesswork
# and false positives.
-Wno-error=alloc-size-larger-than=
CMake: Disable Wformat-truncation (GCC warning) Converting from GLib functions to stdio.h turns up many of these warnings. They are disabled to allow work to go on and until there is consensus on how to handle them. -Wformat-truncation -Wformat-truncation=1 Level 1 of -Wformat-truncation enabled by -Wformat employs a conservative approach that warns only about calls to bounded functions whose return value is unused and that will most likely result in output truncation.
2021-12-17 16:54:52 +00:00
#
# Converting from g_printf() and g_snprintf() to stdio.h turns
# up many of these warnings. They will have to be handled later.
# It can be a lot of work to fix properly and none of them
# seem to flag very interesting issues.
#
-Wno-format-truncation
CMake: do not check stack size when compiling with ASan or UBSan Instrumentation code increases the stack usage. Let's deactivate the check when compiling with ASan or UBSan as the objective here is not to check the stack consumption and its usage is out of our control. Change-Id: I9d6e269a0d404dc1833183a070fdbbb7fb0446e0 Reviewed-on: https://code.wireshark.org/review/22888 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-31 08:43:58 +00:00
)
Fix setting COMMON_WARN_FLAGS. If we want to add -Wframe-larger-than=16384, *append* it, don't *overwrite* it. Indent that code properly while we're at it. Change-Id: Iae8894e6663500620a07589fd6ba3d00f9eac7ba Reviewed-on: https://code.wireshark.org/review/22977 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-06 22:49:13 +00:00
Add a comment explaining why ASan and UBSan are involved. Change-Id: I31a429c247ed9f8efb97560d517423b0bf2d82f1 Reviewed-on: https://code.wireshark.org/review/22979 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-07 00:34:52 +00:00
#
# Code that may be worth looking into (coding practices)
#
Add ThreadSanitizer configure-time options. Add ENABLE_TSAN and enable-tsan options to CMake and Autotools respectively which enable ThreadSanitizer, similar to AddressSanitizer and UndefinedBehaviorSanitizer. Change-Id: I79adf5c1516b0938f140bbf501c181bf14d7619b Reviewed-on: https://code.wireshark.org/review/24515 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-20 20:44:17 +00:00
if((NOT ENABLE_ASAN) AND (NOT ENABLE_TSAN) AND (NOT ENABLE_UBSAN) AND (NOT DISABLE_FRAME_LARGER_THAN_WARNING))
Fix setting COMMON_WARN_FLAGS. If we want to add -Wframe-larger-than=16384, *append* it, don't *overwrite* it. Indent that code properly while we're at it. Change-Id: Iae8894e6663500620a07589fd6ba3d00f9eac7ba Reviewed-on: https://code.wireshark.org/review/22977 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-06 22:49:13 +00:00
#
Add ThreadSanitizer configure-time options. Add ENABLE_TSAN and enable-tsan options to CMake and Autotools respectively which enable ThreadSanitizer, similar to AddressSanitizer and UndefinedBehaviorSanitizer. Change-Id: I79adf5c1516b0938f140bbf501c181bf14d7619b Reviewed-on: https://code.wireshark.org/review/24515 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-20 20:44:17 +00:00
# Only do this if none of ASan, TSan, and UBSan are
Add a comment explaining why ASan and UBSan are involved. Change-Id: I31a429c247ed9f8efb97560d517423b0bf2d82f1 Reviewed-on: https://code.wireshark.org/review/22979 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-07 00:34:52 +00:00
# enabled; the instrumentation they add increases
# the stack usage - we only care about stack
# usage in normal operation.
Fix setting COMMON_WARN_FLAGS. If we want to add -Wframe-larger-than=16384, *append* it, don't *overwrite* it. Indent that code properly while we're at it. Change-Id: Iae8894e6663500620a07589fd6ba3d00f9eac7ba Reviewed-on: https://code.wireshark.org/review/22977 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-06 22:49:13 +00:00
#
CMake: Remove some redundant and overly verbose code The original reason for having a WARN_FLAGS set of variables has been lost. Change-Id: I3eae3cf9d0bad5f3895f6fee59c2c64183c8f244 Reviewed-on: https://code.wireshark.org/review/29526 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-10 00:13:56 +00:00
set(WIRESHARK_COMMON_FLAGS ${WIRESHARK_COMMON_FLAGS}
Boost the maximum frame size. Lemon gets this error on its Parse() function, at least on FreeBSD 11.1 with its version of Clang. Change-Id: I4fc1674373af5c0016ee953b61066bf6b24b7ad6 Reviewed-on: https://code.wireshark.org/review/27905 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-29 23:44:09 +00:00
-Wframe-larger-than=32768
Fix setting COMMON_WARN_FLAGS. If we want to add -Wframe-larger-than=16384, *append* it, don't *overwrite* it. Indent that code properly while we're at it. Change-Id: Iae8894e6663500620a07589fd6ba3d00f9eac7ba Reviewed-on: https://code.wireshark.org/review/22977 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-06 22:49:13 +00:00
)
endif()
Fix indent (use tabs) svn path=/trunk/; revision=53390
2013-11-17 14:03:58 +00:00
CMake: Remove some redundant and overly verbose code The original reason for having a WARN_FLAGS set of variables has been lost. Change-Id: I3eae3cf9d0bad5f3895f6fee59c2c64183c8f244 Reviewed-on: https://code.wireshark.org/review/29526 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-10 00:13:56 +00:00
list(APPEND WIRESHARK_C_ONLY_FLAGS
Fix indent (use tabs) svn path=/trunk/; revision=53390
2013-11-17 14:03:58 +00:00
# The following are C only, not C++
Sync up a bit with configure.ac. Move -Wunused-const-variable after -Wc++-compat. Move -Wduplicated-branches after -Wdocumentation. Add some comments for the warning flags for which the configure script does a test to make sure the compiler doesn't mishandle them. Add some other comments. Change-Id: I7f648ff78eb932feef34aeccfff179bd0a2e5d49 Reviewed-on: https://code.wireshark.org/review/22980 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-07 00:58:00 +00:00
-Wunused-const-variable
#
# XXX - some versions of GCC, including the one in at
# least some Xcode versions that come with Mac OS X
# 10.5, complain about variables in function and
# function pointer *declarations* shadowing other
Put references to autotools in the past tense. In CMake files, we don't do some checks that our autotools scripts did; speak of those in the past tense, as the autotools scripts are gone. (Leave the comments there, to note that we *might* have to reinstate those tests, although they're for old versions of macOS and GCC.) In CMake files, we use some #defines because that's what autotools did; speak of those in the past tense as well. Change-Id: I594fe8225cf94b5087093febc11f6b0a7e42e7cd Reviewed-on: https://code.wireshark.org/review/27149 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-25 16:54:00 +00:00
# variables. The autoconf script checked for that; we
Sync up a bit with configure.ac. Move -Wunused-const-variable after -Wc++-compat. Move -Wduplicated-branches after -Wdocumentation. Add some comments for the warning flags for which the configure script does a test to make sure the compiler doesn't mishandle them. Add some other comments. Change-Id: I7f648ff78eb932feef34aeccfff179bd0a2e5d49 Reviewed-on: https://code.wireshark.org/review/22980 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-07 00:58:00 +00:00
# don't.
Fix indent (use tabs) svn path=/trunk/; revision=53390
2013-11-17 14:03:58 +00:00
-Wshadow
-Wold-style-definition
-Wstrict-prototypes
Sync up a bit with configure.ac. Move -Wunused-const-variable after -Wc++-compat. Move -Wduplicated-branches after -Wdocumentation. Add some comments for the warning flags for which the configure script does a test to make sure the compiler doesn't mishandle them. Add some other comments. Change-Id: I7f648ff78eb932feef34aeccfff179bd0a2e5d49 Reviewed-on: https://code.wireshark.org/review/22980 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-07 00:58:00 +00:00
#
# Some versions of GCC, such as 4.3.2 and 4.4.5,
# generate logical-op warnings when strchr() is given a
Put references to autotools in the past tense. In CMake files, we don't do some checks that our autotools scripts did; speak of those in the past tense, as the autotools scripts are gone. (Leave the comments there, to note that we *might* have to reinstate those tests, although they're for old versions of macOS and GCC.) In CMake files, we use some #defines because that's what autotools did; speak of those in the past tense as well. Change-Id: I594fe8225cf94b5087093febc11f6b0a7e42e7cd Reviewed-on: https://code.wireshark.org/review/27149 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-25 16:54:00 +00:00
# constant string. The autoconf script checked for that;
Sync up a bit with configure.ac. Move -Wunused-const-variable after -Wc++-compat. Move -Wduplicated-branches after -Wdocumentation. Add some comments for the warning flags for which the configure script does a test to make sure the compiler doesn't mishandle them. Add some other comments. Change-Id: I7f648ff78eb932feef34aeccfff179bd0a2e5d49 Reviewed-on: https://code.wireshark.org/review/22980 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-07 00:58:00 +00:00
# we don't.
#
Fix indent (use tabs) svn path=/trunk/; revision=53390
2013-11-17 14:03:58 +00:00
-Wlogical-op
-Wjump-misses-init
Sync up a bit with configure.ac. Move -Wunused-const-variable after -Wc++-compat. Move -Wduplicated-branches after -Wdocumentation. Add some comments for the warning flags for which the configure script does a test to make sure the compiler doesn't mishandle them. Add some other comments. Change-Id: I7f648ff78eb932feef34aeccfff179bd0a2e5d49 Reviewed-on: https://code.wireshark.org/review/22980 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-07 00:58:00 +00:00
#
CMake,autotools: enable -Werror=implicit by default The -Wimplicit error covers two warnings, trying to catch these cases: Setting a global variable without declaring its type (-Wimplicit-int): undeclared_type = 1; More importantly, -Wimplicit-function-declaration catches the case where a function is not declared (missing header, programming error, etc.). Turn these warnings into errors, most likely it will be a programming error that results in a link failure anyway. See also https://fedoraproject.org/wiki/Changes/Fedora26CFlags Also fix autotools checks not to trigger -Wimplicit-int and -Wimplicit-function-declaration (in krb5 check due to missing include). Tested on Ubuntu 16.04 (autotools & cmake) and Arch Linux (cmake), configure/cmake output and config.h are identical. Change-Id: I137284263f3b1223df6e6a893111c3640802631f Reviewed-on: https://code.wireshark.org/review/19331 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-17 22:12:11 +00:00
# Implicit function declarations are an error in C++ and most
# likely a programming error in C. Turn -Wimplicit-int and
# -Wimplicit-function-declaration into an error by default.
#
-Werror=implicit
Fix indent (use tabs) svn path=/trunk/; revision=53390
2013-11-17 14:03:58 +00:00
)
CMake: disable -Wmissing-field-initializers for broken compilers AppleClang 9.1.0.9020039 is complaining about a "missing initializer" in dumpcap.c. Rather than doing ugly things like one of the following: struct s x; memset(&x, 0, sizeof(x)); struct s y = {.field=0}; just disable the warning (enabled via -Wextra) on broken compilers. The minimum versions were determined using https://gcc.godbolt.org/ The special "universal zero initializer { 0 }" exception is explicitly documented in the GCC manual (as shipped with GCC 8.2.1). Clang 6 does not document it, but r314499 (as included with Clang 6) does implement it and adds tests for it. (Xcode 10.0 seems based on Clang 6.0.1.) Change-Id: I8e48d8c424a512ca36ef8c4f832ce81b3675232c Reviewed-on: https://code.wireshark.org/review/30684 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-18 00:44:16 +00:00
#
# The universal zero initializer (in C: struct s x = { 0 };) for
# structures with multiple members is perfectly legal, but some older
# compilers warn about it. Silence those older compilers.
#
CMake: allow nested structures to be initialized via { 0 } This is already permitted since C89 and popular compilers seem to support it (including Clang 3.0 - 7.0, GCC 4.1.2 - 8.2 and MSVC 2015). GCC used to be buggy: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119 C89 6.5.7. Initialization: "only enough initializers from the list are taken to account for the members of the subaggregate". Change-Id: Ic59b9fe71e2d3ce60b4b7d1074f8d84af01a817a Reviewed-on: https://code.wireshark.org/review/30968 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-08 11:11:23 +00:00
if((CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS "5.1") OR
CMake: disable -Wmissing-field-initializers for broken compilers AppleClang 9.1.0.9020039 is complaining about a "missing initializer" in dumpcap.c. Rather than doing ugly things like one of the following: struct s x; memset(&x, 0, sizeof(x)); struct s y = {.field=0}; just disable the warning (enabled via -Wextra) on broken compilers. The minimum versions were determined using https://gcc.godbolt.org/ The special "universal zero initializer { 0 }" exception is explicitly documented in the GCC manual (as shipped with GCC 8.2.1). Clang 6 does not document it, but r314499 (as included with Clang 6) does implement it and adds tests for it. (Xcode 10.0 seems based on Clang 6.0.1.) Change-Id: I8e48d8c424a512ca36ef8c4f832ce81b3675232c Reviewed-on: https://code.wireshark.org/review/30684 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-18 00:44:16 +00:00
(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0") OR
(CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_LESS "10.0"))
CMake: allow nested structures to be initialized via { 0 } This is already permitted since C89 and popular compilers seem to support it (including Clang 3.0 - 7.0, GCC 4.1.2 - 8.2 and MSVC 2015). GCC used to be buggy: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119 C89 6.5.7. Initialization: "only enough initializers from the list are taken to account for the members of the subaggregate". Change-Id: Ic59b9fe71e2d3ce60b4b7d1074f8d84af01a817a Reviewed-on: https://code.wireshark.org/review/30968 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-08 11:11:23 +00:00
if(NOT CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_VERSION VERSION_LESS "4.7")
list(APPEND WIRESHARK_C_ONLY_FLAGS -Wno-missing-field-initializers)
endif()
# Silence warnings for initialization of nested structs like
# struct { struct { int a, b; } s; int c; } v = { 0 };
list(APPEND WIRESHARK_C_ONLY_FLAGS -Wno-missing-braces)
CMake: disable -Wmissing-field-initializers for broken compilers AppleClang 9.1.0.9020039 is complaining about a "missing initializer" in dumpcap.c. Rather than doing ugly things like one of the following: struct s x; memset(&x, 0, sizeof(x)); struct s y = {.field=0}; just disable the warning (enabled via -Wextra) on broken compilers. The minimum versions were determined using https://gcc.godbolt.org/ The special "universal zero initializer { 0 }" exception is explicitly documented in the GCC manual (as shipped with GCC 8.2.1). Clang 6 does not document it, but r314499 (as included with Clang 6) does implement it and adds tests for it. (Xcode 10.0 seems based on Clang 6.0.1.) Change-Id: I8e48d8c424a512ca36ef8c4f832ce81b3675232c Reviewed-on: https://code.wireshark.org/review/30684 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-18 00:44:16 +00:00
endif()
CMake: Remove some redundant and overly verbose code The original reason for having a WARN_FLAGS set of variables has been lost. Change-Id: I3eae3cf9d0bad5f3895f6fee59c2c64183c8f244 Reviewed-on: https://code.wireshark.org/review/29526 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-10 00:13:56 +00:00
list(APPEND WIRESHARK_CXX_ONLY_FLAGS
CMake: limit -Wextra-semi to C++ only Saves a check and removes a GCC warning from CMakeError.log: cc1: warning: command line option ‘-Wextra-semi’ is valid for C++/ObjC++ but not for C Change-Id: I76d027e7b5703b06237ac70eb340c4a09322e09e Fixes: v2.9.0rc0-958-g866ddb1b18 ("Add -Wextra-semi to (clang) C and C++ flags to make sure the buildbots will find this.") Reviewed-on: https://code.wireshark.org/review/30948 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2018-12-06 20:31:01 +00:00
-Wextra-semi
Rework compiler flag detection to be able to handle changed order of flags svn path=/trunk/; revision=54638
2014-01-07 23:08:42 +00:00
)
Sync up a bit with configure.ac. Move -Wunused-const-variable after -Wc++-compat. Move -Wduplicated-branches after -Wdocumentation. Add some comments for the warning flags for which the configure script does a test to make sure the compiler doesn't mishandle them. Add some other comments. Change-Id: I7f648ff78eb932feef34aeccfff179bd0a2e5d49 Reviewed-on: https://code.wireshark.org/review/22980 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-08-07 00:58:00 +00:00
#
# These are not enabled by default, because the warnings they
# produce are very hard or impossible to eliminate.
#
CMake: Remove some redundant and overly verbose code The original reason for having a WARN_FLAGS set of variables has been lost. Change-Id: I3eae3cf9d0bad5f3895f6fee59c2c64183c8f244 Reviewed-on: https://code.wireshark.org/review/29526 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-10 00:13:56 +00:00
if(ENABLE_EXTRA_COMPILER_WARNINGS) # This overrides -Werror
list(APPEND WIRESHARK_COMMON_FLAGS
# 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
-fstrict-overflow -Wstrict-overflow=4
#
# Due to various places where APIs we don't control
# require us to cast away constness, we can probably
# never enable this one with -Werror.
#
-Wcast-qual
#
# All the registration functions block these for now.
#
-Wmissing-prototypes
-Wmissing-declarations
#
# A bunch of "that might not work on SPARC" code blocks
# this one for now; some of it is code that *will* work
# on SPARC, such as casts of "struct sockaddr *" to
# "struct sockaddr_in *", which are required by some
# APIs such as getifaddrs().
#
-Wcast-align
#
# Works only with Clang
#
-Wunreachable-code
#
# Works only with Clang but generates a lot of warnings
# (about glib library not using Doxygen)
#
-Wdocumentation
#
# Works only with GCC 7
#
-Wduplicated-branches
#
# No longer supported by El Capitan clang on C++
# XXX - is this one of those where CMake's check
# doesn't fail, so it won't reject this?
#
-fno-delete-null-pointer-checks
)
Fix indent (use tabs) svn path=/trunk/; revision=53390
2013-11-17 14:03:58 +00:00
CMake: silence -Wunsafe-loop-optimizations for GCC 7 Clang does not implement this option, so do not bother checking it there. GCC 6 is fine, GCC 7 is broken and GCC 8 is fixed again. Change-Id: I3bc9ff4e934e05b1b3ce7d4c4a41bf40d6e38655 Reviewed-on: https://code.wireshark.org/review/32904 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-19 19:50:34 +00:00
#
# Some loops are safe, but it's hard to convince the compiler of
# that. Always disable the warning on GCC 7 due to a bug that
# cause lots of false positives.
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81408
#
if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION MATCHES "^7\\.")
list(APPEND WIRESHARK_COMMON_FLAGS -Wunsafe-loop-optimizations)
endif()
CMake: Remove some redundant and overly verbose code The original reason for having a WARN_FLAGS set of variables has been lost. Change-Id: I3eae3cf9d0bad5f3895f6fee59c2c64183c8f244 Reviewed-on: https://code.wireshark.org/review/29526 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-10 00:13:56 +00:00
list(APPEND WIRESHARK_C_ONLY_FLAGS
# The following are C only, not C++
#
# Due to various places where APIs we don't control
# require us to cast away constness, we can probably
# never enable this one with -Werror.
#
-Wbad-function-cast
)
Rework compiler flag detection to be able to handle changed order of flags svn path=/trunk/; revision=54638
2014-01-07 23:08:42 +00:00
CMake: Remove some redundant and overly verbose code The original reason for having a WARN_FLAGS set of variables has been lost. Change-Id: I3eae3cf9d0bad5f3895f6fee59c2c64183c8f244 Reviewed-on: https://code.wireshark.org/review/29526 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-10 00:13:56 +00:00
list(APPEND WIRESHARK_CXX_ONLY_FLAGS
)
Enable -Wpointer-sign if we're enabling additional compiler warnings. Or, rather, *disable* it only if we're *not* enabling additional compiler warnings. Change-Id: I95c23385a365e0e24f932ea5c680b287b5f717e0 Reviewed-on: https://code.wireshark.org/review/33237 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-16 20:46:07 +00:00
else()
#
# -Wpointer-sign is a default test we get with -Wall and
# -W, but for some reason we were suppressing it -
# unconditionally. Suppress it only without the extra
# warnings, so we can at least see how much we get.
# (This would have caught at least one error - the one
# in change https://code.wireshark.org/review/33234,
# which would have suggested that the wrong
# proto_tree_add_ret_ call was being used.)
#
list(APPEND WIRESHARK_C_ONLY_FLAGS
-Wno-pointer-sign
)
Add --enable-extra-clang-checks for autotools and CMakeList With -Wunreachable-code flags (and disable for the moment -Wdocumentation) Change-Id: I126c962b32e650a63b78092e95896736ae7335c9 Reviewed-on: https://code.wireshark.org/review/678 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-15 11:52:29 +00:00
endif()
CMake+CI: Colorize our compiler output. As described at https://medium.com/@alasher/colored-c-compiler-output-with-ninja-clang-gcc-10bfe7f2b949 both Clang and gcc generate colorized output when they detect a terminal, but not for piped output, which is the case when using Ninja. Add an ENABLE_COMPILER_COLOR_DIAGNOSTICS CMake option, and set it to "ON" when we're using Ninja. In the merge-req:ubuntu-gcc-ctest and merge-req:ubuntu-clang-other-tests GitLab CI jobs, generate colorized HTML report artifacts using ansi2html.
2021-04-12 19:13:02 +00:00
if(ENABLE_COMPILER_COLOR_DIAGNOSTICS)
if(CMAKE_C_COMPILER_ID MATCHES "Clang")
set(WIRESHARK_COMMON_FLAGS ${WIRESHARK_COMMON_FLAGS}
-fcolor-diagnostics
)
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU")
set(WIRESHARK_COMMON_FLAGS ${WIRESHARK_COMMON_FLAGS}
-fdiagnostics-color=always
)
endif()
endif()
CMake: Compile and link flag updates. Add /guard:cf and /Qspectre to the Visual C++ 2015 compile and link flags. Don't bother trying to pass -Wl,--as-needed or -pie to Visual C++. Remove some unneeded quotes. Change-Id: I4d89d61ce9dd579e7cfbcd49df6116810bfb0178 Reviewed-on: https://code.wireshark.org/review/25356 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-16 21:56:58 +00:00
set(WIRESHARK_LD_FLAGS
CMake: We require version greater than 2.8.9. Change-Id: Ia092da9b9bc87c75b6b97a117efc7a0e4b58d29c Reviewed-on: https://code.wireshark.org/review/29509 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-09-09 17:09:47 +00:00
# See also CheckCLinkerFlag.cmake
CMake: Compile and link flag updates. Add /guard:cf and /Qspectre to the Visual C++ 2015 compile and link flags. Don't bother trying to pass -Wl,--as-needed or -pie to Visual C++. Remove some unneeded quotes. Change-Id: I4d89d61ce9dd579e7cfbcd49df6116810bfb0178 Reviewed-on: https://code.wireshark.org/review/25356 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-16 21:56:58 +00:00
-Wl,--as-needed
# -flto
# -fwhopr
# -fwhole-program
)
endif() # ! MSVC
frederic.heem: Update/Add FindPCAP.cmake CMakeInstallDirs.cmake CMakeLists.txt me: Fix a typo, change gcc flags to mimic the behaviour of autofoo stuff. svn path=/trunk/; revision=19707
2006-10-26 15:36:50 +00:00
Slightly rework the detection code for some packages. Make compile flag detection work (needed some not so nice hacks). svn path=/trunk/; revision=30129
2009-09-24 20:42:08 +00:00
# Counterhack to work around some cache magic in CHECK_C_SOURCE_COMPILES
Not yet working: Sync with autofoo: Check for accepted compiler flags. Use identical flags. svn path=/trunk/; revision=29891
2009-09-14 06:51:22 +00:00
include(CheckCCompilerFlag)
Check flags that might be supported by both C and C++ still separately. svn path=/trunk/; revision=54573
2014-01-03 00:40:21 +00:00
include(CheckCXXCompilerFlag)
Try to generate an error when calling clang with an unknown compiler option. This behaviour changed in clang, see https://bugzilla.mozilla.org/show_bug.cgi?id=731316 svn path=/trunk/; revision=50760
2013-07-21 18:12:20 +00:00
Move the static handling to a place where it is effective during package discovery. More work needed to get static really working. v2: - Rebase - Remove accidentally added macos-setup.sh changes Change-Id: Ic3a68d2ab7064afffbf5dcfc90925699e8729780 Reviewed-on: https://code.wireshark.org/review/11082 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-10-17 10:00:27 +00:00
if(ENABLE_STATIC)
set(BUILD_SHARED_LIBS 0)
else()
set(BUILD_SHARED_LIBS 1)
endif()
CMake: Add function to test compiler flags Remove all the duplicate code. Each test result is cached so it needs an unique variable to store the result. Change-Id: Ib591a1d6beaa13337d927a446b4d8d5e687ff610 Reviewed-on: https://code.wireshark.org/review/29485 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-09-07 23:05:40 +00:00
function(test_compiler_flag _lang _this_flag _valid_flags_var)
string(MAKE_C_IDENTIFIER "${_lang}${_this_flag}_VALID" _flag_var)
set(_test_flags "${${_valid_flags_var}} ${_this_flag}")
if(_lang STREQUAL "C")
check_c_compiler_flag("${_test_flags}" ${_flag_var})
elseif(_lang STREQUAL "CXX")
check_cxx_compiler_flag("${_test_flags}" ${_flag_var})
else()
message(FATAL_ERROR "Language must be C or CXX")
Check flags that might be supported by both C and C++ still separately. svn path=/trunk/; revision=54573
2014-01-03 00:40:21 +00:00
endif()
CMake: Add function to test compiler flags Remove all the duplicate code. Each test result is cached so it needs an unique variable to store the result. Change-Id: Ib591a1d6beaa13337d927a446b4d8d5e687ff610 Reviewed-on: https://code.wireshark.org/review/29485 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-09-07 23:05:40 +00:00
if (${_flag_var})
set(${_valid_flags_var} "${_test_flags}" PARENT_SCOPE)
endif()
endfunction()
CMake: Remove some redundant and overly verbose code The original reason for having a WARN_FLAGS set of variables has been lost. Change-Id: I3eae3cf9d0bad5f3895f6fee59c2c64183c8f244 Reviewed-on: https://code.wireshark.org/review/29526 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-10 00:13:56 +00:00
foreach(THIS_FLAG ${WIRESHARK_COMMON_FLAGS} ${WIRESHARK_C_ONLY_FLAGS})
CMake: Add function to test compiler flags Remove all the duplicate code. Each test result is cached so it needs an unique variable to store the result. Change-Id: Ib591a1d6beaa13337d927a446b4d8d5e687ff610 Reviewed-on: https://code.wireshark.org/review/29485 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-09-07 23:05:40 +00:00
test_compiler_flag(C ${THIS_FLAG} ADDED_CMAKE_C_FLAGS)
Check flags that might be supported by both C and C++ still separately. svn path=/trunk/; revision=54573
2014-01-03 00:40:21 +00:00
endforeach()
Allow overriding C/C++ flags from CMake command line Append user's flags to our flags instead of prepending them to make user flags higher priority. Change-Id: I3ead33ee5fa06a2395d9197a027306ef99a704a2 Reviewed-on: https://code.wireshark.org/review/2722 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-30 15:56:28 +00:00
set(CMAKE_C_FLAGS "${ADDED_CMAKE_C_FLAGS} ${CMAKE_C_FLAGS}")
CMake: Remove some redundant and overly verbose code The original reason for having a WARN_FLAGS set of variables has been lost. Change-Id: I3eae3cf9d0bad5f3895f6fee59c2c64183c8f244 Reviewed-on: https://code.wireshark.org/review/29526 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-10 00:13:56 +00:00
foreach(THIS_FLAG ${WIRESHARK_COMMON_FLAGS} ${WIRESHARK_CXX_ONLY_FLAGS})
CMake: Add function to test compiler flags Remove all the duplicate code. Each test result is cached so it needs an unique variable to store the result. Change-Id: Ib591a1d6beaa13337d927a446b4d8d5e687ff610 Reviewed-on: https://code.wireshark.org/review/29485 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-09-07 23:05:40 +00:00
test_compiler_flag(CXX ${THIS_FLAG} ADDED_CMAKE_CXX_FLAGS)
Not yet working: Sync with autofoo: Check for accepted compiler flags. Use identical flags. svn path=/trunk/; revision=29891
2009-09-14 06:51:22 +00:00
endforeach()
Allow overriding C/C++ flags from CMake command line Append user's flags to our flags instead of prepending them to make user flags higher priority. Change-Id: I3ead33ee5fa06a2395d9197a027306ef99a704a2 Reviewed-on: https://code.wireshark.org/review/2722 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-30 15:56:28 +00:00
set(CMAKE_CXX_FLAGS "${ADDED_CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
CMake: Allow setting per target compiler warnings Setting our compiler warning flags in CMAKE_C_FLAGS does not allow using different flags per target. Allow for that possibility by setting the internal WS_WARNINGS_{C,CXX}_FLAGS and using the COMPILE_OPTIONS property to set them. This change is just setting mechanism and there should be no difference in generated warnings. The check_X_compiler_flag cmake test is changed to test each flag individually. We need a list, not a space separated string, and the aggregate test is not significant. Change-Id: I59fc5cd7e130c7a5e001c598e3df3e13f83a6a25 Reviewed-on: https://code.wireshark.org/review/17150 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-08-16 21:21:59 +00:00
CMake: strip directory prefixes from __FILE__ macros Depending on the build location, the full source and/or build directory is currently visible in error messages (for example, DISSECTOR_ASSERT). Remove these to help with reproducible builds and have shorter messages. A similar option (-fdebug-prefix-map) is also needed, but it affects external debugging tools and is therefore better left to distributors (Debian and Arch Linux do this for example). Bug: 15163 Change-Id: Icd8559bef2035f295aefbfc57ba6a342bfe76a41 Reviewed-on: https://code.wireshark.org/review/31645 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-21 11:08:34 +00:00
# Strips the source and build directory prefix from the __FILE__ macro to ensure
# reproducible builds. Supported since GCC 8, Clang support is pending.
if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
# If the build dir is within the source dir, CMake will use something
# like ../epan/dfilter/semcheck.c. Map these relative paths in addition
# to CMAKE_BINARY_DIR since compile_commands.json uses absolute paths.
file(RELATIVE_PATH _relative_source_dir "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}")
string(REGEX REPLACE "/$" "" _relative_source_dir "${_relative_source_dir}")
check_c_compiler_flag(-fmacro-prefix-map=old=new C_fmacro_prefix_map_old_new_VALID)
check_cxx_compiler_flag(-fmacro-prefix-map=old=new CXX_fmacro_prefix_map_old_new_VALID)
foreach(_lang C CXX)
if(${_lang}_fmacro_prefix_map_old_new_VALID)
set(_flags CMAKE_${_lang}_FLAGS)
set(${_flags} "${${_flags}} -fmacro-prefix-map=${CMAKE_SOURCE_DIR}/=")
set(${_flags} "${${_flags}} -fmacro-prefix-map=${CMAKE_BINARY_DIR}/=")
if(_relative_source_dir MATCHES "\\.\\.$")
set(${_flags} "${${_flags}} -fmacro-prefix-map=${_relative_source_dir}/=")
endif()
endif()
endforeach()
endif()
Use cmake_push_check_state() and cmake_pop_check_state(). Change-Id: I70528d5f54f62a51bf6f438669cd70d5f0296ae5 Reviewed-on: https://code.wireshark.org/review/23435 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-09-08 11:32:04 +00:00
include(CMakePushCheckState)
cmake: fix ENABLE_ASAN detection Do not add -fsanitize=undefined when ASAN is requested, UBSAN is a different feature (which could be added later as desired). This makes the -DENABLE_ASAN=1 option match the autotools --enable-asan option. Fail hard if ASAN support is requested but not supported, this avoids surprises when something is wrong. Fix ASAN detection by setting the linker option too. Note: if you have previously set ENABLE_ASAN=1 with the broken ASAN detection, you have to clear your CMakeCache.txt file to redo the detection. Change-Id: Iba6ca0da0336eccedd0cf31a251baad9d1aff5b4 Reviewed-on: https://code.wireshark.org/review/15908 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-14 21:52:01 +00:00
if(ENABLE_ASAN)
Use cmake_push_check_state() and cmake_pop_check_state(). Change-Id: I70528d5f54f62a51bf6f438669cd70d5f0296ae5 Reviewed-on: https://code.wireshark.org/review/23435 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-09-08 11:32:04 +00:00
cmake_push_check_state()
cmake: fix ENABLE_ASAN detection Do not add -fsanitize=undefined when ASAN is requested, UBSAN is a different feature (which could be added later as desired). This makes the -DENABLE_ASAN=1 option match the autotools --enable-asan option. Fail hard if ASAN support is requested but not supported, this avoids surprises when something is wrong. Fix ASAN detection by setting the linker option too. Note: if you have previously set ENABLE_ASAN=1 with the broken ASAN detection, you have to clear your CMakeCache.txt file to redo the detection. Change-Id: Iba6ca0da0336eccedd0cf31a251baad9d1aff5b4 Reviewed-on: https://code.wireshark.org/review/15908 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-14 21:52:01 +00:00
set(CMAKE_REQUIRED_LIBRARIES "-fsanitize=address")
check_c_compiler_flag(-fsanitize=address C__fsanitize_address_VALID)
check_cxx_compiler_flag(-fsanitize=address CXX__fsanitize_address_VALID)
Use cmake_push_check_state() and cmake_pop_check_state(). Change-Id: I70528d5f54f62a51bf6f438669cd70d5f0296ae5 Reviewed-on: https://code.wireshark.org/review/23435 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-09-08 11:32:04 +00:00
cmake_pop_check_state()
cmake: fix ENABLE_ASAN detection Do not add -fsanitize=undefined when ASAN is requested, UBSAN is a different feature (which could be added later as desired). This makes the -DENABLE_ASAN=1 option match the autotools --enable-asan option. Fail hard if ASAN support is requested but not supported, this avoids surprises when something is wrong. Fix ASAN detection by setting the linker option too. Note: if you have previously set ENABLE_ASAN=1 with the broken ASAN detection, you have to clear your CMakeCache.txt file to redo the detection. Change-Id: Iba6ca0da0336eccedd0cf31a251baad9d1aff5b4 Reviewed-on: https://code.wireshark.org/review/15908 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-14 21:52:01 +00:00
if(NOT C__fsanitize_address_VALID OR NOT CXX__fsanitize_address_VALID)
message(FATAL_ERROR "ENABLE_ASAN was requested, but not supported!")
endif()
set(CMAKE_C_FLAGS "-fsanitize=address ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "-fsanitize=address ${CMAKE_CXX_FLAGS}")
Disable ASAN when building lemon. If ASAN is enabled, use "-fno-sanitize=all" when building lemon. This keeps us from having to set ASAN_OPTIONS=detect_leaks=0 in the environment in order to build Wireshark. Change-Id: I36f6d1a4f913ecabaf188f4c2b59216c8430d81a Reviewed-on: https://code.wireshark.org/review/18098 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-06 17:38:39 +00:00
# Disable ASAN for build-time tools, e.g. lemon
check_c_compiler_flag(-fno-sanitize=all C__fno_sanitize_all_VALID)
if(C__fno_sanitize_all_VALID)
set(NO_SANITIZE_CFLAGS "-fno-sanitize=all")
set(NO_SANITIZE_LDFLAGS "-fno-sanitize=all")
endif()
cmake: fix ENABLE_ASAN detection Do not add -fsanitize=undefined when ASAN is requested, UBSAN is a different feature (which could be added later as desired). This makes the -DENABLE_ASAN=1 option match the autotools --enable-asan option. Fail hard if ASAN support is requested but not supported, this avoids surprises when something is wrong. Fix ASAN detection by setting the linker option too. Note: if you have previously set ENABLE_ASAN=1 with the broken ASAN detection, you have to clear your CMakeCache.txt file to redo the detection. Change-Id: Iba6ca0da0336eccedd0cf31a251baad9d1aff5b4 Reviewed-on: https://code.wireshark.org/review/15908 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-14 21:52:01 +00:00
endif()
Add ThreadSanitizer configure-time options. Add ENABLE_TSAN and enable-tsan options to CMake and Autotools respectively which enable ThreadSanitizer, similar to AddressSanitizer and UndefinedBehaviorSanitizer. Change-Id: I79adf5c1516b0938f140bbf501c181bf14d7619b Reviewed-on: https://code.wireshark.org/review/24515 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-20 20:44:17 +00:00
if(ENABLE_TSAN)
# Available since Clang >= 3.2 and GCC >= 4.8
cmake_push_check_state()
set(CMAKE_REQUIRED_LIBRARIES "-fsanitize=thread")
check_c_compiler_flag(-fsanitize=thread C__fsanitize_thread_VALID)
check_cxx_compiler_flag(-fsanitize=thread CXX__fsanitize_thread_VALID)
cmake_pop_check_state()
if(NOT C__fsanitize_thread_VALID OR NOT CXX__fsanitize_thread_VALID)
message(FATAL_ERROR "ENABLE_TSAN was requested, but not supported!")
endif()
set(CMAKE_C_FLAGS "-fsanitize=thread ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "-fsanitize=thread ${CMAKE_CXX_FLAGS}")
set(WS_LINK_FLAGS "-fsanitize=thread ${WS_LINK_FLAGS}")
endif()
Add --enable-ubsan/ENABLE_UBSAN for UndefinedBehaviorSanitizer UndefinedBehaviorSanitizer (UBSan) can catch a lot of issues (out-of-bounds memory access, integer overflows, undefined shifts, etc.) and is recommended during development using GCC or Clang. Add an option for it (similar to ASAN support). Change-Id: Ib0db50cee9eb5af0f5c4f06e07f3899a3a34702d Reviewed-on: https://code.wireshark.org/review/21673 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-05-15 22:09:43 +00:00
if(ENABLE_UBSAN)
Add ThreadSanitizer configure-time options. Add ENABLE_TSAN and enable-tsan options to CMake and Autotools respectively which enable ThreadSanitizer, similar to AddressSanitizer and UndefinedBehaviorSanitizer. Change-Id: I79adf5c1516b0938f140bbf501c181bf14d7619b Reviewed-on: https://code.wireshark.org/review/24515 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-20 20:44:17 +00:00
# Available since Clang >= 3.3 and GCC >= 4.9
Use cmake_push_check_state() and cmake_pop_check_state(). Change-Id: I70528d5f54f62a51bf6f438669cd70d5f0296ae5 Reviewed-on: https://code.wireshark.org/review/23435 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-09-08 11:32:04 +00:00
cmake_push_check_state()
Add --enable-ubsan/ENABLE_UBSAN for UndefinedBehaviorSanitizer UndefinedBehaviorSanitizer (UBSan) can catch a lot of issues (out-of-bounds memory access, integer overflows, undefined shifts, etc.) and is recommended during development using GCC or Clang. Add an option for it (similar to ASAN support). Change-Id: Ib0db50cee9eb5af0f5c4f06e07f3899a3a34702d Reviewed-on: https://code.wireshark.org/review/21673 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-05-15 22:09:43 +00:00
set(CMAKE_REQUIRED_LIBRARIES "-fsanitize=undefined")
check_c_compiler_flag(-fsanitize=undefined C__fsanitize_undefined_VALID)
check_cxx_compiler_flag(-fsanitize=undefined CXX__fsanitize_undefined_VALID)
Use cmake_push_check_state() and cmake_pop_check_state(). Change-Id: I70528d5f54f62a51bf6f438669cd70d5f0296ae5 Reviewed-on: https://code.wireshark.org/review/23435 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-09-08 11:32:04 +00:00
cmake_pop_check_state()
Add --enable-ubsan/ENABLE_UBSAN for UndefinedBehaviorSanitizer UndefinedBehaviorSanitizer (UBSan) can catch a lot of issues (out-of-bounds memory access, integer overflows, undefined shifts, etc.) and is recommended during development using GCC or Clang. Add an option for it (similar to ASAN support). Change-Id: Ib0db50cee9eb5af0f5c4f06e07f3899a3a34702d Reviewed-on: https://code.wireshark.org/review/21673 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-05-15 22:09:43 +00:00
if(NOT C__fsanitize_undefined_VALID OR NOT CXX__fsanitize_undefined_VALID)
message(FATAL_ERROR "ENABLE_UBSAN was requested, but not supported!")
endif()
set(CMAKE_C_FLAGS "-fsanitize=undefined ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "-fsanitize=undefined ${CMAKE_CXX_FLAGS}")
endif()
fuzzshark: integrate oss-fuzz targets in CMake The current fuzzshark target built by CMake is not usable for fuzzing. Address this by adding a new ENABLE_FUZZER option that enables mandatory instrumentation and libFuzzer linking options for the fuzzshark binary. Create more CMake targets for specific fuzzing targets such as fuzzshark_ip and fuzzshark_ip_proto-udp. These targets are not built by default, either build individual targets or use the all-fuzzers target. Now these binaries are not specific to oss-fuzz, so move them to a new directory (perhaps the corpora can be added here in the future). oss-fuzz build.sh is simplified and reuses the CMake targets. When OSS_FUZZ is set, it will force static linking with external libraries and limit parallel linker jobs (maybe not necessary for Google's oss-fuzz builders, but my 8G/6c VM ran out of memory). Change-Id: If3ba8f60ea1f5c3bd2131223050a81f9acbce05d Reviewed-on: https://code.wireshark.org/review/30228 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-16 22:47:20 +00:00
if(ENABLE_FUZZER)
# Available since Clang >= 6
# Will enable coverage flags which can be used by the fuzzshark target.
cmake_push_check_state()
set(CMAKE_REQUIRED_LIBRARIES "-fsanitize=fuzzer-no-link")
check_c_compiler_flag(-fsanitize=fuzzer C__fsanitize_fuzzer_no_link_VALID)
check_cxx_compiler_flag(-fsanitize=fuzzer CXX__fsanitize_fuzzer_no_link_VALID)
cmake_pop_check_state()
if(NOT C__fsanitize_fuzzer_no_link_VALID OR NOT CXX__fsanitize_fuzzer_no_link_VALID)
message(FATAL_ERROR "ENABLE_FUZZER was requested, but not supported!")
endif()
set(CMAKE_C_FLAGS "-fsanitize=fuzzer-no-link ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "-fsanitize=fuzzer-no-link ${CMAKE_CXX_FLAGS}")
endif()
CMake: Add ENABLE_VLD option for MSVC Calling cmake with -DENABLE_VLD=ON when building with Visual Studio, results in debug configuration being linked to Visual Leak Detector. By default, Visual Leak Detector outputs the leak summary to Visual Studio debug window. When ENABLE_VLD is active, VLD is linked to all wireshark libraries and executables.
2021-03-29 10:10:16 +00:00
if(MSVC)
if(ENABLE_VLD)
include(FindVLD)
Windows: move ENABLE_VLD to CMakeOptions.txt
2021-04-26 19:37:06 +00:00
if(NOT VLD_FOUND)
CMake: Add ENABLE_VLD option for MSVC Calling cmake with -DENABLE_VLD=ON when building with Visual Studio, results in debug configuration being linked to Visual Leak Detector. By default, Visual Leak Detector outputs the leak summary to Visual Studio debug window. When ENABLE_VLD is active, VLD is linked to all wireshark libraries and executables.
2021-03-29 10:10:16 +00:00
message(FATAL_ERROR "ENABLE_VLD was requested, but not found!")
endif()
message(STATUS "Enabling Visual Leak Detector in Debug configuration")
set(WS_MSVC_DEBUG_LINK_FLAGS ${VLD_LINK_FLAGS})
endif()
endif()
cmake: make WERROR_COMMON_FLAGS a normal string Instead of checking for the boolean "FALSE", just set an empty string. This avoids the need to check for WERROR_COMMON_FLAGS before using it. The transformation is the same for all files, remove "if (WERROR_COMMON_FLAGS)" and "endif()", reindent and add quotes (since we have a string here and not a list). Modelines have been added where missing. Change-Id: I0ab05ae507c51fa77336d49a99a226399cc81b92 Reviewed-on: https://code.wireshark.org/review/17997 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com>
2016-09-30 14:06:15 +00:00
set(WERROR_COMMON_FLAGS "")
CMake: Use more consistent naming for options Having some options use DISABLE_ and others ENABLE_ is inconsistent and difficult to remember. Use ENABLE_ instead consistently. Frame-larger-than remains an exception.
2021-12-30 01:05:57 +00:00
if(ENABLE_WERROR AND NOT ENABLE_EXTRA_COMPILER_WARNINGS)
CMake: Add /WX Add "/WX" to the Visual C++ compiler flags if DISABLE_WERROR is off, similar to config.nmake. We haven't compiled C++ code with -Wshorten-64-to-32 for quite some time so there's no need to add -Wno-shorten-64-to-32 in ui/qt/CMakeLists.txt. Additionally, squelch ---- C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3050) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3065) : see reference to function template instantiation 'void std::_Median<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3127) : see reference to function template instantiation 'std::pair<_RanIt,_RanIt> std::_Unguarded_partition<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3157) : see reference to function template instantiation 'void std::_Sort<_Iter,int,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Diff,_Pr)' being compiled with [ _Iter=QList<QString>::iterator , _RanIt=QList<QString>::iterator , _Diff=int , _Pr=bool (__cdecl *)(const QString &,const QString &) ] .\rpc_service_response_time_dialog.cpp(130) : see reference to function template instantiation 'void std::sort<QList<QString>::iterator,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3051) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3052) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3053) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) ---- in both rpc_service_response_time_dialog.cpp and wireshark_application.cpp so that we'll compile successfully. Change-Id: I457bcede99dcb1f3c1001f1f559c4901bb000357 Reviewed-on: https://code.wireshark.org/review/10533 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-15 00:19:02 +00:00
if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
set(WERROR_COMMON_FLAGS "/WX")
else()
Don't use -Werror with Apple's llvm-gcc. Its handling of warnings, and of warnings-treated-as-errors, is horribly broken; once you've asked for a warning, and have specified -Werror, there appears to be nothing whatsoever that you can do to keep that warning from being an error *everywhere* in the code. Prior to change Ib591a1d6beaa13337d927a446b4d8d5e687ff610, the tests for warnings were all failing on the macOS buildbot, so *no* warnings were being requested. With this change, a warning won't be reported as an error, but at least it'll be reported. (We should probably switch to using Clang on the macOS buildbot at some point; I don't know whether the version of Clang currently on the buildbot is safe to use, but if we ever run a newer version of Xcode, which doesn't come with llvm-gcc - which may involve running a newer version of macOS on the buildbot as well - it's presumably safe, given that it's the only compiler Apple shipped.) Change-Id: I677967cb87b91f68f08de546e59abff1dbd6788b Reviewed-on: https://code.wireshark.org/review/29623 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-12 04:02:56 +00:00
#
# If a warning has been enabled by -Wall or -W,
# and have specified -Werror, there appears to be
# no way, in Apple's llvm-gcc, to prevent that
# particular warning from giving an error - not
# with a pragma, not with -Wno-{warning}, and not
# with -Wno-error={warning}.
#
# Therefore, with that compiler, we just disable
# -Werror.
#
if ((NOT APPLE) OR CMAKE_C_COMPILER_ID MATCHES "Clang")
check_c_compiler_flag(-Werror WERROR)
if (WERROR)
set(WERROR_COMMON_FLAGS "-Werror")
endif()
CMake: Add /WX Add "/WX" to the Visual C++ compiler flags if DISABLE_WERROR is off, similar to config.nmake. We haven't compiled C++ code with -Wshorten-64-to-32 for quite some time so there's no need to add -Wno-shorten-64-to-32 in ui/qt/CMakeLists.txt. Additionally, squelch ---- C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3050) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3065) : see reference to function template instantiation 'void std::_Median<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3127) : see reference to function template instantiation 'std::pair<_RanIt,_RanIt> std::_Unguarded_partition<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3157) : see reference to function template instantiation 'void std::_Sort<_Iter,int,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Diff,_Pr)' being compiled with [ _Iter=QList<QString>::iterator , _RanIt=QList<QString>::iterator , _Diff=int , _Pr=bool (__cdecl *)(const QString &,const QString &) ] .\rpc_service_response_time_dialog.cpp(130) : see reference to function template instantiation 'void std::sort<QList<QString>::iterator,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3051) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3052) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3053) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) ---- in both rpc_service_response_time_dialog.cpp and wireshark_application.cpp so that we'll compile successfully. Change-Id: I457bcede99dcb1f3c1001f1f559c4901bb000357 Reviewed-on: https://code.wireshark.org/review/10533 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-15 00:19:02 +00:00
endif()
endif()
endif()
Support Sun^WOracle C's -xldscope=hidden for hiding externals. Change-Id: Id9c852f384a4450b82c8d596f4628d1ccbcf95bc Reviewed-on: https://code.wireshark.org/review/6707 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-21 09:00:43 +00:00
#
# Try to have the compiler default to hiding symbols, so that only
# symbols explicitly exported with WS_DLL_PUBLIC will be visible
# outside (shared) libraries; that way, more UN*X builds will catch
# failures to export symbols, rather than having that fail only on
# Windows.
#
# We don't need that with MSVC, as that's the default.
#
if( NOT CMAKE_C_COMPILER_ID MATCHES "MSVC")
#
Fix a typo in a comment. Change-Id: I4bde3d058c0602fe2a1f314a77fb62227d530666 Reviewed-on: https://code.wireshark.org/review/12834 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-23 03:49:01 +00:00
# Try the GCC-and-compatible -fvisibility-hidden first.
Support Sun^WOracle C's -xldscope=hidden for hiding externals. Change-Id: Id9c852f384a4450b82c8d596f4628d1ccbcf95bc Reviewed-on: https://code.wireshark.org/review/6707 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-21 09:00:43 +00:00
#
check_c_compiler_flag(-fvisibility=hidden FVHIDDEN)
if(FVHIDDEN)
CMake: Allow user build flags to override default build flags Autotools has the very useful feature by design of allowing the user to override the default build flags (you break it you keep it). Apparently CMake applies COMPILE_OPTIONS target property after CMAKE_{C,CXX}_FLAGS so that doesn't work here. Prepend our flags to those variables instead to make it work then. Specific target flag overrides can still be added with COMPILER_OPTIONS (e.g: generated files with -Wno-warning) but this is less effective and then we're back at the point where this overrides user flags. It's less of a concern though. Change-Id: I44761a79be4289238e02d4e781fef0099628817b Reviewed-on: https://code.wireshark.org/review/23675 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-09-24 01:30:08 +00:00
set(CMAKE_C_FLAGS "-fvisibility=hidden ${CMAKE_C_FLAGS}")
Support Sun^WOracle C's -xldscope=hidden for hiding externals. Change-Id: Id9c852f384a4450b82c8d596f4628d1ccbcf95bc Reviewed-on: https://code.wireshark.org/review/6707 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-21 09:00:43 +00:00
else()
#
# OK, try the Sun^WOracle C -xldscope=hidden
#
check_c_compiler_flag(-xldscope=hidden XLDSCOPEHIDDEN)
if(XLDSCOPEHIDDEN)
CMake: Allow user build flags to override default build flags Autotools has the very useful feature by design of allowing the user to override the default build flags (you break it you keep it). Apparently CMake applies COMPILE_OPTIONS target property after CMAKE_{C,CXX}_FLAGS so that doesn't work here. Prepend our flags to those variables instead to make it work then. Specific target flag overrides can still be added with COMPILER_OPTIONS (e.g: generated files with -Wno-warning) but this is less effective and then we're back at the point where this overrides user flags. It's less of a concern though. Change-Id: I44761a79be4289238e02d4e781fef0099628817b Reviewed-on: https://code.wireshark.org/review/23675 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-09-24 01:30:08 +00:00
set(CMAKE_C_FLAGS "-xldscope=hidden ${CMAKE_C_FLAGS}")
Support Sun^WOracle C's -xldscope=hidden for hiding externals. Change-Id: Id9c852f384a4450b82c8d596f4628d1ccbcf95bc Reviewed-on: https://code.wireshark.org/review/6707 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-21 09:00:43 +00:00
else()
#
# Anything else?
# If there is anything else, we might want to
# make a list of options to try, and try them
# in a loop.
#
message(WARNING "Hiding shared library symbols is not supported by the compiler."
" All shared library symbols will be exported.")
endif()
The visibility warning is only valid on non-msvc platforms Change-Id: Iec90ac8654d08b63cfda7d14c370f3c800c74038 Reviewed-on: https://code.wireshark.org/review/2263 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16 19:12:30 +00:00
endif()
Export libwsutil symbols using WS_DLL_PUBLIC define This change replaces *.def and *.sym file usage following the guideline at http://gcc.gnu.org/wiki/Visibility svn path=/trunk/; revision=47938
2013-02-28 14:09:46 +00:00
endif()
cmake changes: - Add checking for linker flags - Install plugins with the name including the Wireshark version. This will make it easier to find matching plugin versions if files get just copied over. svn path=/trunk/; revision=32231
2010-03-18 10:27:17 +00:00
include(CheckCLinkerFlag)
CMake: Use more descriptive name than WS_LD_FLAG_VALID0, 1, etc. Change-Id: Iacd0696189a6b6988bd62af3bd188d97dc50b787 Reviewed-on: https://code.wireshark.org/review/29523 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-09-09 22:11:15 +00:00
CMake: fix broken oss-fuzz build due to the -pie option check_function_exists (as used by FindZLIB.cmake) seems to fail with the -pie option as well, do not try to enable it when building for oss-fuzz. Change-Id: I7d7e0fce1972483a14ac0a91a9f144f22c5ae8a0 Fixes: v2.9.0rc0-2349-g895ad30b5a ("CMake: Fix -pie linker test") Reviewed-on: https://code.wireshark.org/review/30431 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-10-30 13:31:39 +00:00
if(NOT CMAKE_C_COMPILER_ID MATCHES "MSVC" AND NOT OSS_FUZZ)
CMake: limit the -pie linker option to executables WS_LINK_FLAGS also apply to libraries, but -pie has no effect on them. Change-Id: I9c7fde228c5faf20edf0ad45692577070b24a280 Reviewed-on: https://code.wireshark.org/review/30239 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-17 20:47:34 +00:00
#
# The -pie linker option produces a position-independent executable.
# Some Linux distributions have this enabled by default in the compiler,
# so setting it here will be superfluous though.
#
# Note that linking with static libraries that are not position
# independent may fail, the user can set CMAKE_EXE_LINKER_FLAGS=-no-pie
# as a workaround.
#
CMake: Reverse CheckPIESupported version check logic Instead of checking for CMake version greater than "3.13.999" check for version lower than "3.14". This fixes the condition for current Pengwin releases which do ship with CMake version "3.13.18112701-MSVC_2". Change-Id: Ib5fc494d7fd42625e24ddac55af8aa92f0e983ec Reviewed-on: https://code.wireshark.org/review/34535 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-09-15 12:33:40 +00:00
if(CMAKE_VERSION VERSION_LESS "3.14")
CMake: silence CMP0083 warning from future CMake 3.14 The current development version of CMake started emitting warnings due to the use of CMAKE_POSITION_INDEPENDENT_CODE without setting CMP0083. Change-Id: Id6747c00fea7a1d28e5ba900ba4578fe89f40f83 Reviewed-on: https://code.wireshark.org/review/31579 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-17 18:34:37 +00:00
check_c_linker_flag(-pie LINK_pie_VALID)
if(LINK_pie_VALID)
set(CMAKE_EXE_LINKER_FLAGS "-pie ${CMAKE_EXE_LINKER_FLAGS}")
endif()
CMake: Reverse CheckPIESupported version check logic Instead of checking for CMake version greater than "3.13.999" check for version lower than "3.14". This fixes the condition for current Pengwin releases which do ship with CMake version "3.13.18112701-MSVC_2". Change-Id: Ib5fc494d7fd42625e24ddac55af8aa92f0e983ec Reviewed-on: https://code.wireshark.org/review/34535 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-09-15 12:33:40 +00:00
else()
include(CheckPIESupported)
check_pie_supported()
CMake: limit the -pie linker option to executables WS_LINK_FLAGS also apply to libraries, but -pie has no effect on them. Change-Id: I9c7fde228c5faf20edf0ad45692577070b24a280 Reviewed-on: https://code.wireshark.org/review/30239 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-17 20:47:34 +00:00
endif()
endif()
cmake changes: - Add checking for linker flags - Install plugins with the name including the Wireshark version. This will make it easier to find matching plugin versions if files get just copied over. svn path=/trunk/; revision=32231
2010-03-18 10:27:17 +00:00
foreach(THIS_FLAG ${WIRESHARK_LD_FLAGS})
CMake: Use more descriptive name than WS_LD_FLAG_VALID0, 1, etc. Change-Id: Iacd0696189a6b6988bd62af3bd188d97dc50b787 Reviewed-on: https://code.wireshark.org/review/29523 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-09-09 22:11:15 +00:00
string(MAKE_C_IDENTIFIER "LINK${THIS_FLAG}_VALID" _flag_var)
check_c_linker_flag(${THIS_FLAG} ${_flag_var})
if (${_flag_var})
set(WS_LINK_FLAGS "${WS_LINK_FLAGS} ${THIS_FLAG}")
cmake changes: - Add checking for linker flags - Install plugins with the name including the Wireshark version. This will make it easier to find matching plugin versions if files get just copied over. svn path=/trunk/; revision=32231
2010-03-18 10:27:17 +00:00
endif()
endforeach()
CMake: Use more descriptive name than WS_LD_FLAG_VALID0, 1, etc. Change-Id: Iacd0696189a6b6988bd62af3bd188d97dc50b787 Reviewed-on: https://code.wireshark.org/review/29523 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-09-09 22:11:15 +00:00
message(STATUS "Linker flags: ${WS_LINK_FLAGS}")
Add a few more optional compiler warnings and some (commented out) ideas for linker flags. svn path=/trunk/; revision=30853
2009-11-07 10:08:36 +00:00
Homebrew installs gettext (including libintl, which GLib requires) in /usr/local/opt/gettext. Tell CMake to update our include and library paths accordingly. svn path=/trunk/; revision=51943
2013-09-10 21:24:52 +00:00
if(APPLE AND EXISTS /usr/local/opt/gettext)
A bunch of "{Mac} OS X" -> "macOS" changes. Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X 10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS X" from 10.8 to 10.11. Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3 Reviewed-on: https://code.wireshark.org/review/20933 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-05 19:15:27 +00:00
# GLib on macOS requires libintl. Homebrew installs gettext (and
Homebrew installs gettext (including libintl, which GLib requires) in /usr/local/opt/gettext. Tell CMake to update our include and library paths accordingly. svn path=/trunk/; revision=51943
2013-09-10 21:24:52 +00:00
# libintl) in /usr/local/opt/gettext
CMake: Use target_include_directores more. The include_directories documentation at https://cmake.org/cmake/help/latest/command/include_directories.html says: "Note: Prefer the target_include_directories() command to add include directories to individual targets and optionally propagate/export them to dependents." Switch from include_directories to target_include_directories in a bunch of places. Add "SYSTEM" to the remaining external include_directories calls in order to minimize our compiler warning blast radius.
2021-02-17 02:04:59 +00:00
include_directories(SYSTEM /usr/local/opt/gettext/include)
Homebrew installs gettext (including libintl, which GLib requires) in /usr/local/opt/gettext. Tell CMake to update our include and library paths accordingly. svn path=/trunk/; revision=51943
2013-09-10 21:24:52 +00:00
link_directories(/usr/local/opt/gettext/lib)
endif()
CMake: clear cache variables when a library has changed On Windows, whenever win-setup.ps1 installs new libraries, the old paths become invalid. As a workaround the user can remove CMakeCache.txt completely or manually delete entries. Removing the whole file might lose custom options and clearing individual entries is tedious. Let's handle this automatically. Some HAVE_xxx variables from check_function_exists calls in PCAP and ZLIB, and one from check_symbol_exists in KERBEROS are not cleared. Those special cases would require too much work, the user should manually clear their cache in this case if needed. Fixes my local build since CARES, KERBEROS and LibXml2 were updated. Special care was necessary for LibXml2 as it will not set cache variable LIBXML2_LIBRARY when LIBXML2_LIBRARIES is already set. Change-Id: Ic793bdb67161504aadadf221bd7740a0ca31db63 Link: https://www.wireshark.org/lists/wireshark-dev/201902/msg00028.html Reviewed-on: https://code.wireshark.org/review/31960 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-10 19:14:58 +00:00
# Resets cache variables if the <PackageName>_LIBRARY has become invalid.
# Call it before a find_package(<PackageName> ...) invocation that uses
# find_library(<PackageName>_LIBRARY ...).
#
# Usage: reset_find_package(<PackageName> [<extra variables to clear>])
function(reset_find_package _package_name)
set(variables
# find_library / find_package
${_package_name}_LIBRARY
${_package_name}_INCLUDE_DIR
# mark_as_advanced
${_package_name}_LIBRARIES
${_package_name}_INCLUDE_DIRS
# Others
${_package_name}_DLL_DIR
${_package_name}_DLLS
${_package_name}_DLL
${_package_name}_PDB
${ARGN}
)
if(NOT ${_package_name}_LIBRARY OR EXISTS ${${_package_name}_LIBRARY})
# Cache variable is already missing or cache entry is valid.
return()
endif()
message(STATUS "Package ${_package_name} has changed, clearing cache.")
foreach(_var IN LISTS variables)
unset(${_var} CACHE)
endforeach()
endfunction()
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
# ws_find_package(<PackageName>
# <CMakeOptions.txt boolean variable>
# <cmakeconfig.h.in macro definition>
# [remaining find_package() arguments])
macro(ws_find_package _package_name _enable_package _package_cmakedefine)
if(${_enable_package})
CMake: clear cache variables when a library has changed On Windows, whenever win-setup.ps1 installs new libraries, the old paths become invalid. As a workaround the user can remove CMakeCache.txt completely or manually delete entries. Removing the whole file might lose custom options and clearing individual entries is tedious. Let's handle this automatically. Some HAVE_xxx variables from check_function_exists calls in PCAP and ZLIB, and one from check_symbol_exists in KERBEROS are not cleared. Those special cases would require too much work, the user should manually clear their cache in this case if needed. Fixes my local build since CARES, KERBEROS and LibXml2 were updated. Special care was necessary for LibXml2 as it will not set cache variable LIBXML2_LIBRARY when LIBXML2_LIBRARIES is already set. Change-Id: Ic793bdb67161504aadadf221bd7740a0ca31db63 Link: https://www.wireshark.org/lists/wireshark-dev/201902/msg00028.html Reviewed-on: https://code.wireshark.org/review/31960 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-10 19:14:58 +00:00
# Clear outdated cache variables if not already.
reset_find_package(${_package_name})
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
find_package(${_package_name} ${ARGN})
if(${_package_name}_FOUND)
set(${_package_cmakedefine} 1)
endif()
endif()
endmacro()
- Add a comment about the magic in the FindXXX.cmake filenames. - Fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4786 Define HAVE_PCAP_VERSION if HAVE_PCAP_LIB_VERSION is set. svn path=/trunk/; revision=32936
2010-05-24 21:59:29 +00:00
CMake: Package list updates. Move gcrypt to the required package section. Fold the various xxx_REQUIRED variables into xxx_OPTIONS. Change-Id: Ib4220d7344e2bbac9062465d175921733bb0fe52 Reviewed-on: https://code.wireshark.org/review/23208 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-25 17:20:59 +00:00
# The minimum package list
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
find_package(Git)
CMake: clear cache variables when a library has changed On Windows, whenever win-setup.ps1 installs new libraries, the old paths become invalid. As a workaround the user can remove CMakeCache.txt completely or manually delete entries. Removing the whole file might lose custom options and clearing individual entries is tedious. Let's handle this automatically. Some HAVE_xxx variables from check_function_exists calls in PCAP and ZLIB, and one from check_symbol_exists in KERBEROS are not cleared. Those special cases would require too much work, the user should manually clear their cache in this case if needed. Fixes my local build since CARES, KERBEROS and LibXml2 were updated. Special care was necessary for LibXml2 as it will not set cache variable LIBXML2_LIBRARY when LIBXML2_LIBRARIES is already set. Change-Id: Ic793bdb67161504aadadf221bd7740a0ca31db63 Link: https://www.wireshark.org/lists/wireshark-dev/201902/msg00028.html Reviewed-on: https://code.wireshark.org/review/31960 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-10 19:14:58 +00:00
reset_find_package(GLIB2 GLIB2_MAIN_INCLUDE_DIR GLIB2_INTERNAL_INCLUDE_DIR)
glib: Bump required version to 2.50 All the currently supported distributions have at least 2.50. Remove a version check.
2022-04-22 12:37:45 +00:00
find_package(GLIB2 "2.50.0" REQUIRED)
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
include_directories(SYSTEM ${GLIB2_INCLUDE_DIRS})
CMake: clear cache variables when a library has changed On Windows, whenever win-setup.ps1 installs new libraries, the old paths become invalid. As a workaround the user can remove CMakeCache.txt completely or manually delete entries. Removing the whole file might lose custom options and clearing individual entries is tedious. Let's handle this automatically. Some HAVE_xxx variables from check_function_exists calls in PCAP and ZLIB, and one from check_symbol_exists in KERBEROS are not cleared. Those special cases would require too much work, the user should manually clear their cache in this case if needed. Fixes my local build since CARES, KERBEROS and LibXml2 were updated. Special care was necessary for LibXml2 as it will not set cache variable LIBXML2_LIBRARY when LIBXML2_LIBRARIES is already set. Change-Id: Ic793bdb67161504aadadf221bd7740a0ca31db63 Link: https://www.wireshark.org/lists/wireshark-dev/201902/msg00028.html Reviewed-on: https://code.wireshark.org/review/31960 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-10 19:14:58 +00:00
reset_find_package(GMODULE2)
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
find_package(GMODULE2)
CMake: clear cache variables when a library has changed On Windows, whenever win-setup.ps1 installs new libraries, the old paths become invalid. As a workaround the user can remove CMakeCache.txt completely or manually delete entries. Removing the whole file might lose custom options and clearing individual entries is tedious. Let's handle this automatically. Some HAVE_xxx variables from check_function_exists calls in PCAP and ZLIB, and one from check_symbol_exists in KERBEROS are not cleared. Those special cases would require too much work, the user should manually clear their cache in this case if needed. Fixes my local build since CARES, KERBEROS and LibXml2 were updated. Special care was necessary for LibXml2 as it will not set cache variable LIBXML2_LIBRARY when LIBXML2_LIBRARIES is already set. Change-Id: Ic793bdb67161504aadadf221bd7740a0ca31db63 Link: https://www.wireshark.org/lists/wireshark-dev/201902/msg00028.html Reviewed-on: https://code.wireshark.org/review/31960 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-10 19:14:58 +00:00
reset_find_package(GTHREAD2)
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
find_package(GTHREAD2 REQUIRED)
CMake: clear cache variables when a library has changed On Windows, whenever win-setup.ps1 installs new libraries, the old paths become invalid. As a workaround the user can remove CMakeCache.txt completely or manually delete entries. Removing the whole file might lose custom options and clearing individual entries is tedious. Let's handle this automatically. Some HAVE_xxx variables from check_function_exists calls in PCAP and ZLIB, and one from check_symbol_exists in KERBEROS are not cleared. Those special cases would require too much work, the user should manually clear their cache in this case if needed. Fixes my local build since CARES, KERBEROS and LibXml2 were updated. Special care was necessary for LibXml2 as it will not set cache variable LIBXML2_LIBRARY when LIBXML2_LIBRARIES is already set. Change-Id: Ic793bdb67161504aadadf221bd7740a0ca31db63 Link: https://www.wireshark.org/lists/wireshark-dev/201902/msg00028.html Reviewed-on: https://code.wireshark.org/review/31960 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-10 19:14:58 +00:00
reset_find_package(GCRYPT GCRYPT_ERROR_LIBRARY)
libgcrypt: Require version 1.8.0 Libgcrypt 1.8.x is required for a large amount of decryption support and is the current LTS version of libgcrypt. The 1.6 and 1.7 series have been end-of-life since 2017-06-30 and 2019-06-30, respectively. The Linux distributions that have versions of libgcrypt before 1.8.0 are nearing or at end of support (RHEL7, SLES 12, Debian stretch, Ubuntu 16.04LTS) and can be supported by the Wireshark 3.6 LTS release series. Remove an enormous amount of ifdefs based on libgcrypt versions 1.6.0, 1.7.0, and 1.8.0. There will be a second pass for the commons defines HAVE_LIBGCRYPT_AEAD, HAVE_LIBGCRYPT_CHACHA20, and HAVE_LIBGCRYPT_CHACHA20_POLY1305, which are now always defined. The ISAKMP dissector has some comments noting that some workarounds were used for libgcrypt 1.6 that aren't needed with 1.7; perhaps that could be updated now.
2022-04-21 01:08:29 +00:00
find_package(GCRYPT "1.8.0" REQUIRED)
Add c-ares to the required library list. Although c-ares support was techically optional, it was either on by default or required in all of our packaging. Go ahead and require it globally. C-ares is widely available and synchronous name resolution can easily result in a horrific user experience. Change-Id: Id67c797316ed6b8a0ab5052e55a43a1b9e2a2464 Reviewed-on: https://code.wireshark.org/review/35188 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-22 19:16:36 +00:00
# C Asynchronous resolver
reset_find_package(CARES)
find_package(CARES "1.5.0" REQUIRED)
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
find_package(LEX REQUIRED)
find_package(Perl REQUIRED)
Make PCRE2 a required dependency
2021-11-12 10:11:25 +00:00
find_package(PCRE2 REQUIRED)
CMake: Copy data files to the run directory. Set DATAFILE_DIR to a value that includes the build configuration. Add a copy_data_files target that copies AUTHORS-SHORT, the default filters, and other support files to the run directory. Add FindPowerShell.cmake and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ declarations which are now covered by copy_data_files. Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 Reviewed-on: https://code.wireshark.org/review/6561 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 21:07:48 +00:00
CMake: try harder to find the right Python version The FindPythonInterp module does not verify that a discovered 'python' program is actually Python 3. Replace this deprecated module by a modern version that was introduced with CMake 3.12. Remove PYTHON_EXECUTABLE from WSDG now that it is much more likely that CMake discovers the right version. Change-Id: I1f8438baced3d5bf9e1e2732980ad177d3257ca3 Reviewed-on: https://code.wireshark.org/review/31468 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-09 18:34:57 +00:00
if(CMAKE_VERSION VERSION_LESS "3.12")
# Locate the Python interpreter. Finds the wrong (Python 2) version if:
# - PATH contains python3.6, but not python3 (3.4). Affects RHEL7+EPEL.
# - Path contains C:\Python27 but not C:\Python37 (which is installed,
# but not present in PATH).
CMake: Bump the minimum Python version to 3.6. Make Python 3.6 the minimum required version. Version 3.6 added support for f-strings.
2022-06-24 17:31:09 +00:00
find_package(PythonInterp 3.6 REQUIRED)
CMake: try harder to find the right Python version The FindPythonInterp module does not verify that a discovered 'python' program is actually Python 3. Replace this deprecated module by a modern version that was introduced with CMake 3.12. Remove PYTHON_EXECUTABLE from WSDG now that it is much more likely that CMake discovers the right version. Change-Id: I1f8438baced3d5bf9e1e2732980ad177d3257ca3 Reviewed-on: https://code.wireshark.org/review/31468 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-09 18:34:57 +00:00
else()
CMake: Bump the minimum Python version to 3.6. Make Python 3.6 the minimum required version. Version 3.6 added support for f-strings.
2022-06-24 17:31:09 +00:00
find_package(Python3 3.6 REQUIRED)
CMake: try harder to find the right Python version The FindPythonInterp module does not verify that a discovered 'python' program is actually Python 3. Replace this deprecated module by a modern version that was introduced with CMake 3.12. Remove PYTHON_EXECUTABLE from WSDG now that it is much more likely that CMake discovers the right version. Change-Id: I1f8438baced3d5bf9e1e2732980ad177d3257ca3 Reviewed-on: https://code.wireshark.org/review/31468 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-09 18:34:57 +00:00
# Several files (including LocatePythonModule) still use the old name
# from FindPythonInterp, let's stick to it for now.
set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
endif()
Start moving win-setup to PowerShell. Add win-setup.ps1, which duplicates the following tasks performed by config.nmake + Makefile.nmake + win-setup.sh: - Create the windows library directory. - Download files. - Download and unpack zip files. - Check and set current-tag.txt Don't verify applications or libraries. CMakeLists.txt does that. Update the Developer's Guide. Have POWERSHELL_COMMAND use dot sourcing instead of "-File", which appears to be a synonym for "-IgnoreTheExitStatusReturnedByThisScript". This removes our dependencies on unzip and wget and reduces our dependency on bash. Change-Id: Ia9def24acbe183d81b9d477fa42e655e4a3a6614 Reviewed-on: https://code.wireshark.org/review/7990 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-07 21:05:52 +00:00
if (NOT WIN32)
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
find_package(Gettext)
find_package(M REQUIRED)
Make it possible to disable building with libpcap. svn path=/trunk/; revision=38795
2011-08-30 11:44:21 +00:00
endif()
extcap: new interface, wifidump, to capture Wi-Fi frames using a remote SSH host
2022-03-08 21:38:13 +00:00
if(BUILD_sshdump OR BUILD_ciscodump OR BUILD_wifidump)
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
set(ENABLE_LIBSSH ON)
else()
set(ENABLE_LIBSSH OFF)
Add Airpcap detection, use it by default on win32 QT5 compile working - NOT. It's almost working, except that I *still* need to get GTK detection working on Win :-( svn path=/trunk/; revision=52513
2013-10-10 20:35:32 +00:00
endif()
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
ws_find_package(LIBSSH ENABLE_LIBSSH HAVE_LIBSSH "0.6")
Add Airpcap detection, use it by default on win32 QT5 compile working - NOT. It's almost working, except that I *still* need to get GTK detection working on Win :-( svn path=/trunk/; revision=52513
2013-10-10 20:35:32 +00:00
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
ws_find_package(PCAP ENABLE_PCAP HAVE_LIBPCAP)
ws_find_package(AIRPCAP ENABLE_AIRPCAP HAVE_AIRPCAP)
ws_find_package(Systemd BUILD_sdjournal HAVE_SYSTEMD)
Add a systemd Journal Export extcap. Add an sdjournal extcap, which reads journal entries using the sd-journal API and dumps them as journal Export Format records. Change-Id: I17ccfa88ab5d053c16c869cd26e580d84022502e Reviewed-on: https://code.wireshark.org/review/29479 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-05 23:29:34 +00:00
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
# Build one of the Qt GUIs?
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
if(BUILD_wireshark OR BUILD_logray)
Get CMake to successfully work with Qt6 Of course it still fails in the compile phase, but only for some of the ui/qt/ files. Wireshark with Qt5 still compiles and runs. To do the build invoke cmake with the following settings added: export CMAKE_PREFIX_PATH=:${MY_QT6_PREFIX}/lib/cmake cmake -DUSE_qt6=ON ... Independently of this patch there is lots of Qt-stuff in CMakeLists.txt that needs review/cleanup: - Some of the stuff can probably be solved in a less hacky way: + There seemed to be a way for QT6 to provide the required c++-standard, but in the end I could not find it. + Once we have a working Qt6 codebase, we may get rid of the USE_qt6 flag and just test for Qt6Core first and if not present check for Qt5Core. - All comments that match /qt ?[4-6]/i need reviewing/cleaning up. - The changes in this patch have been tested to work on all machines that are my mac (macos 12.0.1, XCode 13.1, Intel, GPL-Qt6.2.1 with only the macos package selected, cmake 3.21.4) Add ui/qt/qt6-migration-links.txt for some possibly helpful links
2021-11-18 00:29:59 +00:00
if(USE_qt6)
set(qtver "6")
CMake: Add support for WIRESHARK_QT6_PREFIX_PATH. If USE_qt6 is enabled, set CMAKE_PREFIX_PATH to WIRESHARK_QT6_PREFIX_PATH if it's defined. This lets you more easily switch between Qt 5 and 6 builds. Note that we have experimental support for Qt 6 in the Developer's Guide.
2022-03-21 19:07:13 +00:00
if(DEFINED ENV{WIRESHARK_QT6_PREFIX_PATH})
set(CMAKE_PREFIX_PATH $ENV{WIRESHARK_QT6_PREFIX_PATH})
endif()
Get CMake to successfully work with Qt6 Of course it still fails in the compile phase, but only for some of the ui/qt/ files. Wireshark with Qt5 still compiles and runs. To do the build invoke cmake with the following settings added: export CMAKE_PREFIX_PATH=:${MY_QT6_PREFIX}/lib/cmake cmake -DUSE_qt6=ON ... Independently of this patch there is lots of Qt-stuff in CMakeLists.txt that needs review/cleanup: - Some of the stuff can probably be solved in a less hacky way: + There seemed to be a way for QT6 to provide the required c++-standard, but in the end I could not find it. + Once we have a working Qt6 codebase, we may get rid of the USE_qt6 flag and just test for Qt6Core first and if not present check for Qt5Core. - All comments that match /qt ?[4-6]/i need reviewing/cleaning up. - The changes in this patch have been tested to work on all machines that are my mac (macos 12.0.1, XCode 13.1, Intel, GPL-Qt6.2.1 with only the macos package selected, cmake 3.21.4) Add ui/qt/qt6-migration-links.txt for some possibly helpful links
2021-11-18 00:29:59 +00:00
else()
set(qtver "5")
CMake: Add support for WIRESHARK_QT6_PREFIX_PATH. If USE_qt6 is enabled, set CMAKE_PREFIX_PATH to WIRESHARK_QT6_PREFIX_PATH if it's defined. This lets you more easily switch between Qt 5 and 6 builds. Note that we have experimental support for Qt 6 in the Developer's Guide.
2022-03-21 19:07:13 +00:00
# XXX We used to recommend setting QT5_BASE_DIR. Remove after the 4.0 branch is created.
if(WIN32 AND DEFINED ENV{QT5_BASE_DIR})
message(WARNING "Support for QT5_BASE_DIR will be removed in a future release.")
set(QT5_BASE_PATH "$ENV{QT5_BASE_DIR}")
set(CMAKE_PREFIX_PATH "${QT5_BASE_PATH}")
endif()
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
endif()
if(APPLE AND EXISTS /usr/local/opt/qt5)
# Homebrew installs Qt5 (up to at least 5.11.0) in
# /usr/local/qt5. Ensure that it can be found by CMake
# since it is not in the default /usr/local prefix.
# Add it to PATHS so that it doesn't override the
# CMAKE_PREFIX_PATH environment variable.
# QT_FIND_PACKAGE_OPTIONS should be passed to find_package,
# e.g. find_package(Qt5Core ${QT_FIND_PACKAGE_OPTIONS})
list(APPEND QT_FIND_PACKAGE_OPTIONS PATHS /usr/local/opt/qt5)
CMake: More Qt4 removal. Remove some Qt major version checks. Remove the ENABLE_QT5 option. Change-Id: I891bc90956a2ea2cd5a7c50c56d9fcbfc963d6c2 Reviewed-on: https://code.wireshark.org/review/26785 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-07 10:58:17 +00:00
endif()
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
set(QT_PACKAGELIST
Get CMake to successfully work with Qt6 Of course it still fails in the compile phase, but only for some of the ui/qt/ files. Wireshark with Qt5 still compiles and runs. To do the build invoke cmake with the following settings added: export CMAKE_PREFIX_PATH=:${MY_QT6_PREFIX}/lib/cmake cmake -DUSE_qt6=ON ... Independently of this patch there is lots of Qt-stuff in CMakeLists.txt that needs review/cleanup: - Some of the stuff can probably be solved in a less hacky way: + There seemed to be a way for QT6 to provide the required c++-standard, but in the end I could not find it. + Once we have a working Qt6 codebase, we may get rid of the USE_qt6 flag and just test for Qt6Core first and if not present check for Qt5Core. - All comments that match /qt ?[4-6]/i need reviewing/cleaning up. - The changes in this patch have been tested to work on all machines that are my mac (macos 12.0.1, XCode 13.1, Intel, GPL-Qt6.2.1 with only the macos package selected, cmake 3.21.4) Add ui/qt/qt6-migration-links.txt for some possibly helpful links
2021-11-18 00:29:59 +00:00
Qt${qtver}Core
Qt${qtver}Gui
Qt${qtver}LinguistTools
Readd feature to make QtXMultimedia optional again In order to be able to defer solving all Qt6 API differences at once I tried to reactivate the QT_MULTIMEDIA_LIB feature. I managed to fix most problems but one problem remains in both Qt5 and Qt6 builds. Without Qt[56]Multimedia, the following error exceeds my non-existing C++ knowledge: jmayer/work/wireshark/git/ui/qt/rtp_player_dialog.cpp:154:18: error: out-of-line definition of 'RtpPlayerDialog' does not match any declaration in 'RtpPlayerDialog' RtpPlayerDialog::RtpPlayerDialog(QWidget &parent, CaptureFile &cf, bool capture_running) : ^~~~~~~~~~~~~~~
2021-11-21 21:05:36 +00:00
# Our code currently does not compile with Qt6Multimedia
# Qt${qtver}Multimedia
Get CMake to successfully work with Qt6 Of course it still fails in the compile phase, but only for some of the ui/qt/ files. Wireshark with Qt5 still compiles and runs. To do the build invoke cmake with the following settings added: export CMAKE_PREFIX_PATH=:${MY_QT6_PREFIX}/lib/cmake cmake -DUSE_qt6=ON ... Independently of this patch there is lots of Qt-stuff in CMakeLists.txt that needs review/cleanup: - Some of the stuff can probably be solved in a less hacky way: + There seemed to be a way for QT6 to provide the required c++-standard, but in the end I could not find it. + Once we have a working Qt6 codebase, we may get rid of the USE_qt6 flag and just test for Qt6Core first and if not present check for Qt5Core. - All comments that match /qt ?[4-6]/i need reviewing/cleaning up. - The changes in this patch have been tested to work on all machines that are my mac (macos 12.0.1, XCode 13.1, Intel, GPL-Qt6.2.1 with only the macos package selected, cmake 3.21.4) Add ui/qt/qt6-migration-links.txt for some possibly helpful links
2021-11-18 00:29:59 +00:00
Qt${qtver}PrintSupport
Qt${qtver}Widgets
CMake: More Qt4 removal. Remove some Qt major version checks. Remove the ENABLE_QT5 option. Change-Id: I891bc90956a2ea2cd5a7c50c56d9fcbfc963d6c2 Reviewed-on: https://code.wireshark.org/review/26785 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-07 10:58:17 +00:00
)
Get CMake to successfully work with Qt6 Of course it still fails in the compile phase, but only for some of the ui/qt/ files. Wireshark with Qt5 still compiles and runs. To do the build invoke cmake with the following settings added: export CMAKE_PREFIX_PATH=:${MY_QT6_PREFIX}/lib/cmake cmake -DUSE_qt6=ON ... Independently of this patch there is lots of Qt-stuff in CMakeLists.txt that needs review/cleanup: - Some of the stuff can probably be solved in a less hacky way: + There seemed to be a way for QT6 to provide the required c++-standard, but in the end I could not find it. + Once we have a working Qt6 codebase, we may get rid of the USE_qt6 flag and just test for Qt6Core first and if not present check for Qt5Core. - All comments that match /qt ?[4-6]/i need reviewing/cleaning up. - The changes in this patch have been tested to work on all machines that are my mac (macos 12.0.1, XCode 13.1, Intel, GPL-Qt6.2.1 with only the macos package selected, cmake 3.21.4) Add ui/qt/qt6-migration-links.txt for some possibly helpful links
2021-11-18 00:29:59 +00:00
if(USE_qt6)
set(CMAKE_CXX_STANDARD 17)
# Setting CMAKE_CXX_STANDARD is not sufficient with MSVC, see
# https://gitlab.kitware.com/cmake/cmake/-/issues/18837
CMakeLists.txt: Fix enabling the use of C++ 2017 with MSVC
2021-11-26 13:42:47 +00:00
# The below test can be found in Qt6, lib/cmake/Qt6/QtFeature.cmake
Get CMake to successfully work with Qt6 Of course it still fails in the compile phase, but only for some of the ui/qt/ files. Wireshark with Qt5 still compiles and runs. To do the build invoke cmake with the following settings added: export CMAKE_PREFIX_PATH=:${MY_QT6_PREFIX}/lib/cmake cmake -DUSE_qt6=ON ... Independently of this patch there is lots of Qt-stuff in CMakeLists.txt that needs review/cleanup: - Some of the stuff can probably be solved in a less hacky way: + There seemed to be a way for QT6 to provide the required c++-standard, but in the end I could not find it. + Once we have a working Qt6 codebase, we may get rid of the USE_qt6 flag and just test for Qt6Core first and if not present check for Qt5Core. - All comments that match /qt ?[4-6]/i need reviewing/cleaning up. - The changes in this patch have been tested to work on all machines that are my mac (macos 12.0.1, XCode 13.1, Intel, GPL-Qt6.2.1 with only the macos package selected, cmake 3.21.4) Add ui/qt/qt6-migration-links.txt for some possibly helpful links
2021-11-18 00:29:59 +00:00
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND MSVC_VERSION GREATER_EQUAL 1913)
CMakeLists.txt: Fix enabling the use of C++ 2017 with MSVC
2021-11-26 13:42:47 +00:00
add_definitions("-Zc:__cplusplus")
Get CMake to successfully work with Qt6 Of course it still fails in the compile phase, but only for some of the ui/qt/ files. Wireshark with Qt5 still compiles and runs. To do the build invoke cmake with the following settings added: export CMAKE_PREFIX_PATH=:${MY_QT6_PREFIX}/lib/cmake cmake -DUSE_qt6=ON ... Independently of this patch there is lots of Qt-stuff in CMakeLists.txt that needs review/cleanup: - Some of the stuff can probably be solved in a less hacky way: + There seemed to be a way for QT6 to provide the required c++-standard, but in the end I could not find it. + Once we have a working Qt6 codebase, we may get rid of the USE_qt6 flag and just test for Qt6Core first and if not present check for Qt5Core. - All comments that match /qt ?[4-6]/i need reviewing/cleaning up. - The changes in this patch have been tested to work on all machines that are my mac (macos 12.0.1, XCode 13.1, Intel, GPL-Qt6.2.1 with only the macos package selected, cmake 3.21.4) Add ui/qt/qt6-migration-links.txt for some possibly helpful links
2021-11-18 00:29:59 +00:00
endif()
list(APPEND QT_PACKAGELIST Qt6Core5Compat)
else()
Readd feature to make QtXMultimedia optional again In order to be able to defer solving all Qt6 API differences at once I tried to reactivate the QT_MULTIMEDIA_LIB feature. I managed to fix most problems but one problem remains in both Qt5 and Qt6 builds. Without Qt[56]Multimedia, the following error exceeds my non-existing C++ knowledge: jmayer/work/wireshark/git/ui/qt/rtp_player_dialog.cpp:154:18: error: out-of-line definition of 'RtpPlayerDialog' does not match any declaration in 'RtpPlayerDialog' RtpPlayerDialog::RtpPlayerDialog(QWidget &parent, CaptureFile &cf, bool capture_running) : ^~~~~~~~~~~~~~~
2021-11-21 21:05:36 +00:00
list(APPEND QT_PACKAGELIST Qt5Multimedia)
Get CMake to successfully work with Qt6 Of course it still fails in the compile phase, but only for some of the ui/qt/ files. Wireshark with Qt5 still compiles and runs. To do the build invoke cmake with the following settings added: export CMAKE_PREFIX_PATH=:${MY_QT6_PREFIX}/lib/cmake cmake -DUSE_qt6=ON ... Independently of this patch there is lots of Qt-stuff in CMakeLists.txt that needs review/cleanup: - Some of the stuff can probably be solved in a less hacky way: + There seemed to be a way for QT6 to provide the required c++-standard, but in the end I could not find it. + Once we have a working Qt6 codebase, we may get rid of the USE_qt6 flag and just test for Qt6Core first and if not present check for Qt5Core. - All comments that match /qt ?[4-6]/i need reviewing/cleaning up. - The changes in this patch have been tested to work on all machines that are my mac (macos 12.0.1, XCode 13.1, Intel, GPL-Qt6.2.1 with only the macos package selected, cmake 3.21.4) Add ui/qt/qt6-migration-links.txt for some possibly helpful links
2021-11-18 00:29:59 +00:00
if(WIN32)
list(APPEND QT_PACKAGELIST Qt5WinExtras)
endif()
CMake: More Qt4 removal. Remove some Qt major version checks. Remove the ENABLE_QT5 option. Change-Id: I891bc90956a2ea2cd5a7c50c56d9fcbfc963d6c2 Reviewed-on: https://code.wireshark.org/review/26785 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-07 10:58:17 +00:00
endif()
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
foreach(_qt_package IN LISTS QT_PACKAGELIST)
find_package(${_qt_package} REQUIRED ${QT_FIND_PACKAGE_OPTIONS})
list(APPEND QT_LIBRARIES ${${_qt_package}_LIBRARIES})
list(APPEND QT_INCLUDE_DIRS ${${_qt_package}_INCLUDE_DIRS})
list(APPEND QT_COMPILE_DEFINITIONS ${${_qt_package}_COMPILE_DEFINITIONS})
endforeach()
CMake: fix macOS build when Qt5 and Qt6 are both installed When both qt (qt@6) and qt5 are installed via Homebrew, the build fails: FAILED: ui/qt/CMakeFiles/qtui.dir/qtui_autogen/mocs_compilation.cpp.o ... In file included from ui/qt/qtui_autogen/mocs_compilation.cpp:2: In file included from ui/qt/qtui_autogen/EWIEGA46WW/moc_about_dialog.cpp:10: In file included from ui/qt/qtui_autogen/EWIEGA46WW/../../../../../repos/wireshark/ui/qt/about_dialog.h:15: In file included from /Users/pwu/repos/wireshark/ui/qt/models/astringlist_list_model.h:15: In file included from /usr/local/opt/qt5/lib/QtCore.framework/Headers/QAbstractTableModel:1: In file included from /usr/local/opt/qt5/lib/QtCore.framework/Headers/qabstractitemmodel.h:43: In file included from /usr/local/include/QtCore/qvariant.h:43: In file included from /usr/local/include/QtCore/qatomic.h:41: /usr/local/include/QtCore/qglobal.h:667:26: error: no template named 'enable_if_t' in namespace 'std'; did you mean 'enable_if'? typename = std::enable_if_t<std::is_arithmetic_v<T> && std::is_arithmetic_v<U> && ~~~~~^ That qvariant.h header is from Qt 6 which is backwards incompatible: /usr/local/include/QtCore -> ../Cellar/qt/6.0.2/include/QtCore It appears that `<qt5 prefix>/include` must be explicitly included as the default Qt5 include directories does not cover this: $ find /usr/local -lname '*include/QtCore' -ls ... /usr/local/include/QtCore -> ../Cellar/qt/6.0.2/include/QtCore $ find /usr/local -name qvariant.h -ls ... /usr/local/Cellar/qt@5/5.15.2/lib/QtCore.framework/Versions/5/Headers/qvariant.h ... /usr/local/Cellar/qt/6.0.2/lib/QtCore.framework/Versions/A/Headers/qvariant.h $ find /usr/local -name QtCore -lname '*Headers' -ls ... /usr/local/Cellar/qt@5/5.15.2/include/QtCore -> ../lib/QtCore.framework/Headers ... /usr/local/Cellar/qt/6.0.2/include/QtCore -> ../lib/QtCore.framework/Headers $ ls -la /usr/local/opt/qt5 ... /usr/local/opt/qt5 -> ../Cellar/qt@5/5.15.2
2021-03-10 17:01:09 +00:00
if(APPLE AND "/usr/local/opt/qt5/lib/QtCore.framework" IN_LIST Qt5Core_INCLUDE_DIRS)
# When qt@6 and qt@5 are both installed via Homebrew,
# /usr/local/include/QtCore/qvariant.h points to Qt 6 headers.
# Normally the Headers from `-iframework /usr/local/opt/qt5/lib`
# should be used, but `-isystem /usr/local/include` (via
# Libgcrypt and others) seems to prioritized, resulting in use
# of the Qt6 headers. Resolve this by explicit including Qt5.
list(APPEND QT_INCLUDE_DIRS /usr/local/opt/qt5/include)
endif()
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
set(QT_FOUND ON)
Get CMake to successfully work with Qt6 Of course it still fails in the compile phase, but only for some of the ui/qt/ files. Wireshark with Qt5 still compiles and runs. To do the build invoke cmake with the following settings added: export CMAKE_PREFIX_PATH=:${MY_QT6_PREFIX}/lib/cmake cmake -DUSE_qt6=ON ... Independently of this patch there is lots of Qt-stuff in CMakeLists.txt that needs review/cleanup: - Some of the stuff can probably be solved in a less hacky way: + There seemed to be a way for QT6 to provide the required c++-standard, but in the end I could not find it. + Once we have a working Qt6 codebase, we may get rid of the USE_qt6 flag and just test for Qt6Core first and if not present check for Qt5Core. - All comments that match /qt ?[4-6]/i need reviewing/cleaning up. - The changes in this patch have been tested to work on all machines that are my mac (macos 12.0.1, XCode 13.1, Intel, GPL-Qt6.2.1 with only the macos package selected, cmake 3.21.4) Add ui/qt/qt6-migration-links.txt for some possibly helpful links
2021-11-18 00:29:59 +00:00
if(APPLE)
macOS: Require Sparkle 2. Remove our Sparkle 1 code. Fixes #18035.
2022-04-21 17:11:08 +00:00
ws_find_package(Sparkle ENABLE_SPARKLE HAVE_SOFTWARE_UPDATE 2)
Get CMake to successfully work with Qt6 Of course it still fails in the compile phase, but only for some of the ui/qt/ files. Wireshark with Qt5 still compiles and runs. To do the build invoke cmake with the following settings added: export CMAKE_PREFIX_PATH=:${MY_QT6_PREFIX}/lib/cmake cmake -DUSE_qt6=ON ... Independently of this patch there is lots of Qt-stuff in CMakeLists.txt that needs review/cleanup: - Some of the stuff can probably be solved in a less hacky way: + There seemed to be a way for QT6 to provide the required c++-standard, but in the end I could not find it. + Once we have a working Qt6 codebase, we may get rid of the USE_qt6 flag and just test for Qt6Core first and if not present check for Qt5Core. - All comments that match /qt ?[4-6]/i need reviewing/cleaning up. - The changes in this patch have been tested to work on all machines that are my mac (macos 12.0.1, XCode 13.1, Intel, GPL-Qt6.2.1 with only the macos package selected, cmake 3.21.4) Add ui/qt/qt6-migration-links.txt for some possibly helpful links
2021-11-18 00:29:59 +00:00
endif()
Readd feature to make QtXMultimedia optional again In order to be able to defer solving all Qt6 API differences at once I tried to reactivate the QT_MULTIMEDIA_LIB feature. I managed to fix most problems but one problem remains in both Qt5 and Qt6 builds. Without Qt[56]Multimedia, the following error exceeds my non-existing C++ knowledge: jmayer/work/wireshark/git/ui/qt/rtp_player_dialog.cpp:154:18: error: out-of-line definition of 'RtpPlayerDialog' does not match any declaration in 'RtpPlayerDialog' RtpPlayerDialog::RtpPlayerDialog(QWidget &parent, CaptureFile &cf, bool capture_running) : ^~~~~~~~~~~~~~~
2021-11-21 21:05:36 +00:00
if(Qt${qtver}Multimedia_FOUND)
set(QT_MULTIMEDIA_LIB 1)
endif()
Prepare the cmake infrastucture for eventually building wireshark and qtshark simultanously. The "only" missing thing for this is now ui/qt/CMakeLists.txt ;) svn path=/trunk/; revision=40799
2012-02-02 00:46:02 +00:00
endif()
Transition from GeoIP Legacy to MaxMindDB. MaxMind is discontinuing its legacy databases in April in favor of GeoIP2, which use a newer database format (MaxMind DB). The reference C library (libmaxminddb) is available under the Apache 2.0 license which isn't quite compatible with ours. Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin and prints resolved information on stdout. Place it under a liberal license (MIT) so that we can keep libmaxminddb at arm's length. Add epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it via stdio. Migrate the preferences and documentation to MaxMindDB. Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the geographic coordinate fields to FT_DOUBLEs. Bug: 10658 Change-Id: I24aeed637bea1b41d173270bda413af230f4425f Reviewed-on: https://code.wireshark.org/review/26214 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-09 01:20:26 +00:00
# MaxMind DB address resolution
CMake: clear stale MaxMindDB cache entries if needed On macOS with Homebrew, the version is included with the library path. On updates, the old MAXMINDDB_LIBRARY is invalidated. However ws_find_package only checks MaxMindDB_LIBRARY. Windows has a similar problem. Make sure to clear the stale value such that newer versions can be found, fixing the build. Fixes #17069
2021-06-23 10:07:37 +00:00
reset_find_package(MAXMINDDB)
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
ws_find_package(MaxMindDB BUILD_mmdbresolve HAVE_MAXMINDDB)
Transition from GeoIP Legacy to MaxMindDB. MaxMind is discontinuing its legacy databases in April in favor of GeoIP2, which use a newer database format (MaxMind DB). The reference C library (libmaxminddb) is available under the Apache 2.0 license which isn't quite compatible with ours. Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin and prints resolved information on stdout. Place it under a liberal license (MIT) so that we can keep libmaxminddb at arm's length. Add epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it via stdio. Migrate the preferences and documentation to MaxMindDB. Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the geographic coordinate fields to FT_DOUBLEs. Bug: 10658 Change-Id: I24aeed637bea1b41d173270bda413af230f4425f Reviewed-on: https://code.wireshark.org/review/26214 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-09 01:20:26 +00:00
CMAKE: Get most of of missing *build* pieces into place svn path=/trunk/; revision=29819
2009-09-09 13:20:33 +00:00
# SMI SNMP
CMake: clear cache variables when a library has changed On Windows, whenever win-setup.ps1 installs new libraries, the old paths become invalid. As a workaround the user can remove CMakeCache.txt completely or manually delete entries. Removing the whole file might lose custom options and clearing individual entries is tedious. Let's handle this automatically. Some HAVE_xxx variables from check_function_exists calls in PCAP and ZLIB, and one from check_symbol_exists in KERBEROS are not cleared. Those special cases would require too much work, the user should manually clear their cache in this case if needed. Fixes my local build since CARES, KERBEROS and LibXml2 were updated. Special care was necessary for LibXml2 as it will not set cache variable LIBXML2_LIBRARY when LIBXML2_LIBRARIES is already set. Change-Id: Ic793bdb67161504aadadf221bd7740a0ca31db63 Link: https://www.wireshark.org/lists/wireshark-dev/201902/msg00028.html Reviewed-on: https://code.wireshark.org/review/31960 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-10 19:14:58 +00:00
reset_find_package(SMI SMI_SHARE_DIR)
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
ws_find_package(SMI ENABLE_SMI HAVE_LIBSMI)
CMAKE: Get most of of missing *build* pieces into place svn path=/trunk/; revision=29819
2009-09-09 13:20:33 +00:00
Add support for RSA decryption using PKCS #11 tokens Add support for loading RSA private key files from PKCS #11 tokens, identified by PKCS #11 URIs. Add a new 'pkcs11_libs' UAT which can dynamically load PKCS #11 provider libraries that are not found by p11-kit. The configuration GUI will need additional code to discover available PKCS #11 tokens and will be added later. This feature requires GnuTLS 3.4 with PKCS #11 support, so Windows, macOS via Homebrew, Ubuntu 16.04, Debian Stretch. Not supported: RHEL7. Currently macOS via official packages disables PKCS #11 support, so that will also not work. Change-Id: I20646bfd69c6bd13c8c2d27cb65c164a4b0b7a66 Reviewed-on: https://code.wireshark.org/review/30855 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-12 13:34:00 +00:00
# Support for TLS decryption using RSA private keys.
gnutls: Bump version to 3.5.8 Bum the minimum version of GnuTLS to 3.5.8, which was the first stable release in the 3.5 series. All the currently supported Linux distributions have a version at least this new.
2022-04-23 00:54:16 +00:00
ws_find_package(GNUTLS ENABLE_GNUTLS HAVE_LIBGNUTLS "3.5.8")
CMAKE: Get most of of missing *build* pieces into place svn path=/trunk/; revision=29819
2009-09-09 13:20:33 +00:00
Update to add the last missing detection stuff. Some of it is untested, kerberos is currently a hack. Apart from that, package detection should be complete. svn path=/trunk/; revision=29838
2009-09-10 07:04:54 +00:00
# Kerberos
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
ws_find_package(KERBEROS ENABLE_KERBEROS HAVE_KERBEROS)
Update to add the last missing detection stuff. Some of it is untested, kerberos is currently a hack. Apart from that, package detection should be complete. svn path=/trunk/; revision=29838
2009-09-10 07:04:54 +00:00
CMAKE: Get most of of missing *build* pieces into place svn path=/trunk/; revision=29819
2009-09-09 13:20:33 +00:00
# Zlib compression
Windows: Start using a `vcpkg export` bundle. Create a library bundle using `vcpkg export ... --zip` as described at https://vcpkg.readthedocs.io/en/latest/users/integration/#export-command. The bundle includes the following packages: gettext 0.19-8 glib 2.52.3-13 libffi 3.1-4 libiconv 1.15-5 liblzma 5.2.4 libxml2 2.9.9-4 pcre 8.41-1 zlib 1.2.11-5 It also includes a CMake toolchain file which we might want to make use of in the future. This means we no longer compile Zlib locally. Update the CMake environment accordingly and remove zlib from win-setup.ps1. It includes PDBs, so add them to the PDB .zip. Change-Id: I0a94904a86d836e990019dab62af506573be1f35 Reviewed-on: https://code.wireshark.org/review/31377 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-04 23:37:46 +00:00
ws_find_package(ZLIB ENABLE_ZLIB HAVE_ZLIB)
CMAKE: Get most of of missing *build* pieces into place svn path=/trunk/; revision=29819
2009-09-09 13:20:33 +00:00
Qt: Import Profile information Allow easy import of profiles. Profiles must be stored inside a zip file, with no additional hierarchy. Change-Id: I0ae77460c20ef6b3e447906e671b0cefa6b9b032 Reviewed-on: https://code.wireshark.org/review/33881 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2019-07-10 22:25:45 +00:00
# Minizip compression
ws_find_package(Minizip ENABLE_MINIZIP HAVE_MINIZIP)
Add brotli decompression support for HTTP and HTTP2 dissectors. Change-Id: I9c09f55673187f6fee723fcd72798fb6b9958b03 Reviewed-on: https://code.wireshark.org/review/32745 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-10 10:52:52 +00:00
# Brotli compression
ws_find_package(BROTLI ENABLE_BROTLI HAVE_BROTLI)
cql: add lz4 and snappy decompression We do not use the STARTUP negotiation since a stream can be captured in its middle but try to decompress if the flag is present and fallback if it fails. Change-Id: Iecbf49a45220b04be7808869c9884548eb1e7694 Signed-off-by: Benoît Canet <benoit@scylladb.com> Reviewed-on: https://code.wireshark.org/review/17952 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-26 14:25:11 +00:00
# LZ4 compression
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
ws_find_package(LZ4 ENABLE_LZ4 HAVE_LZ4)
cql: add lz4 and snappy decompression We do not use the STARTUP negotiation since a stream can be captured in its middle but try to decompress if the flag is present and fallback if it fails. Change-Id: Iecbf49a45220b04be7808869c9884548eb1e7694 Signed-off-by: Benoît Canet <benoit@scylladb.com> Reviewed-on: https://code.wireshark.org/review/17952 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-26 14:25:11 +00:00
# Snappy compression
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
ws_find_package(SNAPPY ENABLE_SNAPPY HAVE_SNAPPY)
cql: add lz4 and snappy decompression We do not use the STARTUP negotiation since a stream can be captured in its middle but try to decompress if the flag is present and fallback if it fails. Change-Id: Iecbf49a45220b04be7808869c9884548eb1e7694 Signed-off-by: Benoît Canet <benoit@scylladb.com> Reviewed-on: https://code.wireshark.org/review/17952 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-26 14:25:11 +00:00
Kafka: include zstd compression in Kafka message batches Change-Id: I1d06486ccf7b174ee9aa621fa3d8acb8b3673777 Reviewed-on: https://code.wireshark.org/review/34222 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-12 21:57:45 +00:00
# zstd compression
cmake: check minimum zstd library version. The APIs used in the kafka dissector have been introduced in version 1.0.0, then we need at least that version to work. Change-Id: I80ded2362d4f324ec26392bd7a9781ea6d9ba630 Reviewed-on: https://code.wireshark.org/review/34382 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-27 13:49:13 +00:00
ws_find_package(ZSTD ENABLE_ZSTD HAVE_ZSTD "1.0.0")
Kafka: include zstd compression in Kafka message batches Change-Id: I1d06486ccf7b174ee9aa621fa3d8acb8b3673777 Reviewed-on: https://code.wireshark.org/review/34222 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-12 21:57:45 +00:00
cmake: add ENABLE_NGHTTP2 option Allow nghttp2 to be disabled, similar to --without-nghttp2. Change-Id: Id27ab12ef7c24a535824f762ce2feb20fba9e065 Reviewed-on: https://code.wireshark.org/review/23247 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-27 21:07:55 +00:00
# Enhanced HTTP/2 dissection
nghttp2: Implement minimum required version 1.11.0 All currently supported Linux distributions have a version greater than 1.11.0 (and our macOS and Windows versions are also much greater), and this allows us to use nghttp2_hd_inflate_hd2(), which replaced the deprecated nghttp2_hd_inflate_hd()
2022-04-24 01:19:43 +00:00
ws_find_package(NGHTTP2 ENABLE_NGHTTP2 HAVE_NGHTTP2 "1.11.0")
cmake: add ENABLE_NGHTTP2 option Allow nghttp2 to be disabled, similar to --without-nghttp2. Change-Id: Id27ab12ef7c24a535824f762ce2feb20fba9e065 Reviewed-on: https://code.wireshark.org/review/23247 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-27 21:07:55 +00:00
Lua - it's not just for breakfast^Wdissectors any more! Change-Id: I7cefdec10a2fdd47f8a50ab5a45002662cc14f3c Reviewed-on: https://code.wireshark.org/review/3302 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31 21:00:33 +00:00
# Embedded Lua interpreter
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
ws_find_package(LUA ENABLE_LUA HAVE_LUA "5.1")
CMAKE: Get most of of missing *build* pieces into place svn path=/trunk/; revision=29819
2009-09-09 13:20:33 +00:00
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
ws_find_package(NL ENABLE_NETLINK HAVE_LIBNL)
Complete cmake support for netlink detection svn path=/trunk/; revision=43421
2012-06-20 20:59:43 +00:00
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
ws_find_package(SBC ENABLE_SBC HAVE_SBC)
Add Bluetooth SBC Codec support in cmake SBC Codec can be optionally linked with Wireshark to provide ability to playing RTP/SBC stream by RTP Player. Change-Id: Iffbae16a741ffbfd0fb55a300064739d2c27c2e5 Reviewed-on: https://code.wireshark.org/review/223 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-16 10:12:35 +00:00
CMake: Adjust wsutil includes and linking. Mark wsutil's includes SYSTEM PRIVATE. This exposed a lot of targets that were indirectly picking up include paths via the wsutil target, so add direct includes where needed. The G.722 and G.726 codecs were implicilty including tiffio.h; find it explicitly instead. Mark some of wsutil's libraries PRIVATE, but leave commonly-used ones PUBLIC. Ping #17477.
2021-07-13 18:02:52 +00:00
# SpanDSP codec
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
ws_find_package(SPANDSP ENABLE_SPANDSP HAVE_SPANDSP)
codecs: Add support for G.722 and G.726 Integrate the Spandsp library for G.722 and G.726 support. Adds support for G.722 and all eight variants of G.726. Note: this also fixes a crash in Qt (buffer overrun, reading too much data) caused by confusion of the larger output buffer (resample_buff) with the smaller input buffer (decode_buff). It was not triggered before because the sample rate was always 8k, but with the addition of the new codecs, a different sample rate became possible (16k). Fix also a crash which occurs when the RTP_STREAM_DEBUG macro is enabled and the VOIP Calls dialog is opened (the begin frame, start_fd, is not yet known and therfore a NULL dereference could occur). Passes testing (plays normally without bad RTP timing errors) with SampleCaptures files: sip-rtp-g722.pcap and sip-rtp-g726.pcap. Tested with cmake (Qt), autotools (Qt and GTK+) with ASAN enabled. Bug: 5619 Change-Id: I5661908d193927bba50901079119eeff0c04991f Reviewed-on: https://code.wireshark.org/review/18939 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-11-23 23:27:14 +00:00
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
ws_find_package(BCG729 ENABLE_BCG729 HAVE_BCG729)
Add G.729 decoding based on bcg729 library Bug: 13635 Change-Id: Ic22a0719a59da13e51425aeb747e88caca0d6512 Reviewed-on: https://code.wireshark.org/review/22808 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-26 21:23:12 +00:00
RTP: decode iLBC payload It is possible to decode iLBC payload. It uses libilbc library (https://github.com/TimothyGu/libilbc). Bug: 16314 Change-Id: Id4cad7ae32305a0e94ef32beb24e07733d7f834e Reviewed-on: https://code.wireshark.org/review/35686 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-18 22:55:25 +00:00
ws_find_package(ILBC ENABLE_ILBC HAVE_ILBC)
RTP: opus playback It's possible to play opus payload with libopus (https://opus-codec.org/). Closes #16882. Helped-by: Pascal Quantin <pascal.quantin@gmail.com> Signed-off-by: Lin Sun <lin.sun@zoom.us> Signed-off-by: Yuanzhi Li <ryanlee@mail.ustc.edu.cn>
2020-09-29 04:33:06 +00:00
ws_find_package(OPUS ENABLE_OPUS HAVE_OPUS)
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
if (BUILD_logray)
Remove libsinsp search on Windows The library is unlikely to ever be made available for Windows so don't attempt to find it.
2022-03-27 18:30:32 +00:00
# libsinsp+libscap, required for falco-bridge
ws_find_package(Sinsp ENABLE_SINSP HAVE_SINSP)
endif()
Rename Sysdig Bridge to Falco Bridge. The Sysdig Bridge plugin loads Falco plugins, so rename it to Falco Bridge. Make it optional and dependent on libsinsp+libscap, similar to our codec plugins. Remove some unused code.
2022-03-10 20:21:12 +00:00
CMake: clear cache variables when a library has changed On Windows, whenever win-setup.ps1 installs new libraries, the old paths become invalid. As a workaround the user can remove CMakeCache.txt completely or manually delete entries. Removing the whole file might lose custom options and clearing individual entries is tedious. Let's handle this automatically. Some HAVE_xxx variables from check_function_exists calls in PCAP and ZLIB, and one from check_symbol_exists in KERBEROS are not cleared. Those special cases would require too much work, the user should manually clear their cache in this case if needed. Fixes my local build since CARES, KERBEROS and LibXml2 were updated. Special care was necessary for LibXml2 as it will not set cache variable LIBXML2_LIBRARY when LIBXML2_LIBRARIES is already set. Change-Id: Ic793bdb67161504aadadf221bd7740a0ca31db63 Link: https://www.wireshark.org/lists/wireshark-dev/201902/msg00028.html Reviewed-on: https://code.wireshark.org/review/31960 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-10 19:14:58 +00:00
# CMake 3.9 and below used 'LIBXML2_LIBRARIES' as the name of the cache entry
# storing the find_library result. Transfer it to the new cache variable such
# that reset_find_package can detect and clear outdated cache variables.
if(DEFINED LIBXML2_LIBRARIES AND NOT DEFINED LIBXML2_LIBRARY)
set(LIBXML2_LIBRARY ${LIBXML2_LIBRARIES} CACHE FILEPATH "")
endif()
# Call reset_find_package explicitly since variables are in upper case.
reset_find_package(LIBXML2)
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
ws_find_package(LibXml2 ENABLE_LIBXML2 HAVE_LIBXML2)
CMake: Fix build without LibXml2 This is still needed when LibXml2 is missing, otherwise the build fails with: CMake Error: The following variables are used in this project, but they are set to NOTFOUND. Fixes: v2.9.1rc0-625-gd17e218918 ("CMake: Update FindLibXml2.cmake") Change-Id: I06fc2c18aa82dd553d5a10604c1a874c9a2e88a8 Reviewed-on: https://code.wireshark.org/review/31896 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-05 12:21:51 +00:00
if(NOT LIBXML2_FOUND)
# CMake 3.9 and below used LIBXML2_LIBRARIES as the name of
# the cache entry storing the find_library result.
# Current CMake (3.13) and below sets LIBXML2_LIBRARIES and LIBXML2_INCLUDE_DIRS
# to a non-empty value, be sure to clear it when not found.
set(LIBXML2_LIBRARIES "")
set(LIBXML2_INCLUDE_DIRS "")
endif()
Add libxml2 as optional dependency This can be used by dissectors that need to parse out-of-band configuration. Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783 Reviewed-on: https://code.wireshark.org/review/20912 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-04-04 21:23:59 +00:00
CMake: look for libcap on Linux only The feature is Linux-specific, do not suggest an unavailable feature on macOS and other systems. Change-Id: If53989749f571ace7397e288e9c06e357d0a96b2 Reviewed-on: https://code.wireshark.org/review/35985 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2020-01-29 22:29:05 +00:00
# Capabilities to run dumpcap as non-root user.
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
ws_find_package(CAP ENABLE_CAP HAVE_LIBCAP)
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
find_package(SETCAP)
Update to add the last missing detection stuff. Some of it is untested, kerberos is currently a hack. Apart from that, package detection should be complete. svn path=/trunk/; revision=29838
2009-09-10 07:04:54 +00:00
endif()
Add WinSparkle to the CMake build to bring it into line with the nmake build Change-Id: I944d0fe15b396cad4d0054b6fc359acb42ae3c9c Reviewed-on: https://code.wireshark.org/review/3755 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-20 21:29:33 +00:00
# Windows version updates
case-sensitive: Fix casing for PCAP and WinSparkle CMake is unable to find PCAP and WinSparkle under Windows when using case sensitive folders. Change-Id: I30ba4073afc6089b08cef3c010b09c257362929b Reviewed-on: https://code.wireshark.org/review/35505 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-12-19 14:10:23 +00:00
ws_find_package(WinSparkle ENABLE_WINSPARKLE HAVE_SOFTWARE_UPDATE)
Make building with GeoIP, Python, Capabilities and c-ares actually work. svn path=/trunk/; revision=29870
2009-09-12 17:20:08 +00:00
macOS: Make Wireshark.app drag-installable. Create ChmodBPF installer and uninstaller packages using pkgbuild and productbuild. Place them in Wireshark.app/Resources/Extras. Add a path_helper installer and uninstaller which respectively add and remove /etc/*paths.d/Wireshark. Remove the PackageMaker and utility-launcher assets and build targets. Show a message in the main welcome screen if we don't have capture permissions. Add an link which launches the ChmodBPF installer. Add a "macOS Extras" item to About → Folders. Migrate "Read me first" from RTF to Asciidoctor, which lets us add links and looks like our other documentation. Rename dmg_set_style.scpt to arrange_dmg.applescript and make it plain text. Always run it in osx-dmg.sh. Bug: 6991 Bug: 12593 Bug: 11399 Ping-Bug: 16074 Change-Id: I7b6aa89aae2be522b4141b0d44e8142dec749e90 Reviewed-on: https://code.wireshark.org/review/31047 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-12 00:26:51 +00:00
find_package( Asciidoctor 1.5 )
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
find_package(DOXYGEN)
cmake/ Add some more (hackish) tests. Add a LICENSE file until I find the time to add it to all files individually. CMakeLists.txt Add some addiotional stuff regarding options. Add (non-working) code to generate config.h Handle GTK1 vs GTK2 and GLIB1 vs GLIB2 svn path=/trunk/; revision=19168
2006-09-06 22:28:19 +00:00
CMake: Check for and use system SpeexDSP library Change-Id: I8443379d23a2946dd21c12e5e0bd5464ab73ca25 Reviewed-on: https://code.wireshark.org/review/31857 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-02-02 14:52:07 +00:00
# The SpeexDSP resampler is required iff building wireshark or sharkd.
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
if(BUILD_wireshark OR BUILD_logray OR BUILD_sharkd)
MSYS2: Use system SpeexDSP package
2021-11-12 10:50:29 +00:00
# We don't provide a binary package for SpeexDSP in our repository.
# If using the repository don't bother searching for a system SpeexDSP
# installation and just use the bundled resampler code instead.
if (NOT USE_REPOSITORY)
Windows: Don't search for a SpeexDSP package
2021-09-19 21:34:00 +00:00
find_package(SpeexDSP)
endif()
CMake: Check for and use system SpeexDSP library Change-Id: I8443379d23a2946dd21c12e5e0bd5464ab73ca25 Reviewed-on: https://code.wireshark.org/review/31857 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-02-02 14:52:07 +00:00
if(SpeexDSP_FOUND)
set(HAVE_SPEEXDSP 1)
else()
add_subdirectory(speexdsp)
set(SPEEXDSP_INCLUDE_DIRS "")
set(SPEEXDSP_LIBRARIES "speexresampler")
endif()
endif()
CMake: Make the rpmbuild output quiet by default. If CMAKE_VERBOSE_MAKEFILE is false (the default), pass `--quiet` to rpmbuild.
2021-01-09 18:49:24 +00:00
# Generate the distribution tarball.
Remove support for CPack. It's very incomplete and we already have installation makers for supported OSes. Change-Id: Ide6332b9b6d69b66e7262662d781b548526ab752 Reviewed-on: https://code.wireshark.org/review/22226 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-19 14:37:29 +00:00
add_custom_target(dist
tarball+RPM: Fetch our version from CMake. Move git-export-release.sh to packaging/source. Have the source and RPM packaging derive version information from CMake's VERSION variable. This brings them in line with the rest of our packaging and avoids having to read chicken entrails^W^Wgit output. Make sure we always generate wireshark.spec. Bug: 15359 Change-Id: I188efda489c94449a10a612abebf9c2872c305cb Reviewed-on: https://code.wireshark.org/review/31504 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-11 22:34:03 +00:00
COMMAND ${CMAKE_BINARY_DIR}/packaging/source/git-export-release.sh -d "${CMAKE_BINARY_DIR}"
Add a destination directory flag to git-export-release. Add a destination directory flag to git-export-release.sh. Use it to replace the current "dist" target. Use it in the RPM section to avoid a symlink. Change-Id: I30ae76b3ab1a995d232e748b79aa37440f90f854 Reviewed-on: https://code.wireshark.org/review/26974 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16 18:39:27 +00:00
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
Remove support for CPack. It's very incomplete and we already have installation makers for supported OSes. Change-Id: Ide6332b9b6d69b66e7262662d781b548526ab752 Reviewed-on: https://code.wireshark.org/review/22226 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-19 14:37:29 +00:00
)
gnutls: Bump version to 3.5.8 Bum the minimum version of GnuTLS to 3.5.8, which was the first stable release in the 3.5 series. All the currently supported Linux distributions have a version at least this new.
2022-04-23 00:54:16 +00:00
if(GNUTLS_FOUND)
macOS: Enable PKCS #11 support when building with macos-setup.sh Enable PKCS #11 support in macOS builds with macos-setup.sh (already supported on macOS via Homebrew and on all other OSes with GnuTLS 3.4 or greater) by installing p11-kit (and its dependency libtasn1) and building nettle and GnuTLS against it.
2020-11-26 06:10:34 +00:00
# Calculating public keys from PKCS #11 private keys requires GnuTLS
# 3.4.0 or greater.
Add support for RSA decryption using PKCS #11 tokens Add support for loading RSA private key files from PKCS #11 tokens, identified by PKCS #11 URIs. Add a new 'pkcs11_libs' UAT which can dynamically load PKCS #11 provider libraries that are not found by p11-kit. The configuration GUI will need additional code to discover available PKCS #11 tokens and will be added later. This feature requires GnuTLS 3.4 with PKCS #11 support, so Windows, macOS via Homebrew, Ubuntu 16.04, Debian Stretch. Not supported: RHEL7. Currently macOS via official packages disables PKCS #11 support, so that will also not work. Change-Id: I20646bfd69c6bd13c8c2d27cb65c164a4b0b7a66 Reviewed-on: https://code.wireshark.org/review/30855 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-12 13:34:00 +00:00
#
macOS: Enable PKCS #11 support when building with macos-setup.sh Enable PKCS #11 support in macOS builds with macos-setup.sh (already supported on macOS via Homebrew and on all other OSes with GnuTLS 3.4 or greater) by installing p11-kit (and its dependency libtasn1) and building nettle and GnuTLS against it.
2020-11-26 06:10:34 +00:00
# Check that the support is present in case GnuTLS was compiled
GnuTLS: Bump minimum version to 3.3.0 Every supported distribution has at least the 3.3 branch of GnuTLS (stable branch starting in April 2014). That branch was maintained for bug-fixes until July 2018, so some distributions (e.g. RHEL7, SUSE Enterprise 12) are still on it, keeping us from requiring 3.4 yet. Also clarify a comment about when the Mac OS build of gnutls started being compiled with pkcs11 support.
2020-12-21 16:27:44 +00:00
# --without-p11-kit as macos-setup.sh did until December 2020.
Add support for RSA decryption using PKCS #11 tokens Add support for loading RSA private key files from PKCS #11 tokens, identified by PKCS #11 URIs. Add a new 'pkcs11_libs' UAT which can dynamically load PKCS #11 provider libraries that are not found by p11-kit. The configuration GUI will need additional code to discover available PKCS #11 tokens and will be added later. This feature requires GnuTLS 3.4 with PKCS #11 support, so Windows, macOS via Homebrew, Ubuntu 16.04, Debian Stretch. Not supported: RHEL7. Currently macOS via official packages disables PKCS #11 support, so that will also not work. Change-Id: I20646bfd69c6bd13c8c2d27cb65c164a4b0b7a66 Reviewed-on: https://code.wireshark.org/review/30855 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-12 13:34:00 +00:00
cmake_push_check_state()
if(WIN32)
set(CMAKE_REQUIRED_DEFINITIONS -Dssize_t=int)
endif()
set(CMAKE_REQUIRED_INCLUDES ${GNUTLS_INCLUDE_DIRS})
set(CMAKE_REQUIRED_LIBRARIES ${GNUTLS_LIBRARIES})
check_symbol_exists(gnutls_pkcs11_obj_list_import_url4 gnutls/pkcs11.h HAVE_GNUTLS_PKCS11)
cmake_pop_check_state()
endif()
CMake: Make sure we use the same minimum macOS version everywhere. Add a MIN_MACOS_VERSION variable. Update it and sanity check it according to CMAKE_OSX_DEPLOYMENT_TARGET and our Qt version. Use it to set our minimum macOS version in various places. Change-Id: Icaf0dbe463f34d182986868021e2b56d2239da38 Reviewed-on: https://code.wireshark.org/review/31048 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-14 19:30:39 +00:00
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
if (QT_FOUND)
Require Qt 5.9 or later Increase the minimum required version of Qt from 5.6 to the next LTS version, 5.9. The various Linux distributions that have not released an update to 5.9 or later (SLES 12, Debian stretch) are nearing end of support, and can be supported by the Wireshark 3.6 LTS release. Qt 5.9 requires macOS 10.0, so make that the minimum macOS version as well. Remove unneeded version checks (except from QCustomPlot).
2022-04-20 22:59:32 +00:00
if (Qt${qtver}Widgets_VERSION VERSION_LESS 5.9)
message(FATAL_ERROR "Qt 5.9 or later is required.")
List some removed features in the release notes. Require Qt 5.2 in CMakeLists.txt. Remove some old Qt 4 checks. Change-Id: I06814b3776b488d55a0ce1a26aaada43fb5e096c Reviewed-on: https://code.wireshark.org/review/27446 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-10 15:53:42 +00:00
endif()
Fix Qt4 moc option argument and add build parametrization Change-Id: Ib758f0eabaf96f9c6010201e7e16147fcfa0daa2 Reviewed-on: https://code.wireshark.org/review/13671 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-02 19:00:37 +00:00
if(NOT DEFINED MOC_OPTIONS)
Use "old-style" moc options to ensure backward compatibility for Qt tools Change-Id: Ic96df4ba521e0fbaf4ac34f23e3a89304ed5de5c Reviewed-on: https://code.wireshark.org/review/14662 Reviewed-by: João Valverde <j@v6e.pt>
2016-03-28 08:07:12 +00:00
# Squelch moc verbose "nothing to do" output
set(MOC_OPTIONS -nn)
Fix Qt4 moc option argument and add build parametrization Change-Id: Ib758f0eabaf96f9c6010201e7e16147fcfa0daa2 Reviewed-on: https://code.wireshark.org/review/13671 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-02 19:00:37 +00:00
endif()
CMake+macOS: Make sure we're using the right Qt tools. Qt5CoreConfigExtras.cmake sets Qt5::qmake. Use it to find the corresponding path to macdeployqt and use those in osx-app.sh. Change-Id: I2e67f0126e272fc95d40476b9bfc83ab38d73cee Reviewed-on: https://code.wireshark.org/review/28359 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-20 22:59:41 +00:00
# CMake uses qmake to find Qt4. It relies on Qt's CMake modules
# to find Qt5. This means that we can't assume that the qmake
# in our PATH is the correct one. We can fetch qmake's location
Fix more repeated words throughout Fixes more repeated words seen throughout the code base.
2021-12-31 03:03:45 +00:00
# from Qt5::qmake, which is defined in Qt5CoreConfigExtras.cmake.
Get CMake to successfully work with Qt6 Of course it still fails in the compile phase, but only for some of the ui/qt/ files. Wireshark with Qt5 still compiles and runs. To do the build invoke cmake with the following settings added: export CMAKE_PREFIX_PATH=:${MY_QT6_PREFIX}/lib/cmake cmake -DUSE_qt6=ON ... Independently of this patch there is lots of Qt-stuff in CMakeLists.txt that needs review/cleanup: - Some of the stuff can probably be solved in a less hacky way: + There seemed to be a way for QT6 to provide the required c++-standard, but in the end I could not find it. + Once we have a working Qt6 codebase, we may get rid of the USE_qt6 flag and just test for Qt6Core first and if not present check for Qt5Core. - All comments that match /qt ?[4-6]/i need reviewing/cleaning up. - The changes in this patch have been tested to work on all machines that are my mac (macos 12.0.1, XCode 13.1, Intel, GPL-Qt6.2.1 with only the macos package selected, cmake 3.21.4) Add ui/qt/qt6-migration-links.txt for some possibly helpful links
2021-11-18 00:29:59 +00:00
get_target_property(QT_QMAKE_EXECUTABLE Qt${qtver}::qmake IMPORTED_LOCATION)
CMake+macOS: Make sure we're using the right Qt tools. Qt5CoreConfigExtras.cmake sets Qt5::qmake. Use it to find the corresponding path to macdeployqt and use those in osx-app.sh. Change-Id: I2e67f0126e272fc95d40476b9bfc83ab38d73cee Reviewed-on: https://code.wireshark.org/review/28359 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-20 22:59:41 +00:00
get_filename_component(_qt_bin_path "${QT_QMAKE_EXECUTABLE}" DIRECTORY)
set(QT_BIN_PATH "${_qt_bin_path}" CACHE INTERNAL
"Path to qmake, macdeployqt, windeployqt, and other Qt utilities."
)
# Use qmake to find windeployqt and macdeployqt. Ideally one of
# the modules in ${QTDIR}/lib/cmake would do this for us.
if(WIN32)
Qt6+MSYS2: Fix windeployqt usage The msys2 qt6 package installs windeployqt as windeployqt-qt6.
2022-05-25 22:27:40 +00:00
if (USE_qt6 AND USE_MSYSTEM)
set(_windeployqt_name "windeployqt-qt6")
else()
set(_windeployqt_name "windeployqt")
endif()
find_program(QT_WINDEPLOYQT_EXECUTABLE ${_windeployqt_name}
CMake+macOS: Make sure we're using the right Qt tools. Qt5CoreConfigExtras.cmake sets Qt5::qmake. Use it to find the corresponding path to macdeployqt and use those in osx-app.sh. Change-Id: I2e67f0126e272fc95d40476b9bfc83ab38d73cee Reviewed-on: https://code.wireshark.org/review/28359 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-20 22:59:41 +00:00
HINTS "${QT_BIN_PATH}"
DOC "Path to the windeployqt utility."
)
elseif(APPLE)
find_program(QT_MACDEPLOYQT_EXECUTABLE macdeployqt
HINTS "${QT_BIN_PATH}"
DOC "Path to the macdeployqt utility."
)
macOS: Use dmgbuild to build our .dmg. Scripting the Finder in order to lay out our disk image assumes that we have access to the Finder. This might not be the case on our builder, and it arguably shoudn't be. Switch from using a Bash script + AppleScript to build and lay out our .dmg to using dmgbuild, which creates our .DS_Store directly using Python's ds_store module. Change-Id: I2e4a9dd89bc8297c9cbd9df7aa8d3a44447bde85 Reviewed-on: https://code.wireshark.org/review/34623 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-09-25 20:17:31 +00:00
find_program(DMGBUILD_EXECUTABLE dmgbuild
DOC "Path to the dmgbuild utility"
)
CMake: Add a MIN_MACOS_VERSION check for Qt 5.15. According to https://doc.qt.io/qt-5/supported-platforms.html, Qt 5.15 supports macOS 10.13 - 10.15. Change-Id: Iecd9b6f10d6b968ad145d247e934fddec25658f7 Reviewed-on: https://code.wireshark.org/review/37330 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <gharris@sonic.net>
2020-05-27 22:00:46 +00:00
# https://doc.qt.io/qt-5/supported-platforms.html
CMake: Make sure we use the same minimum macOS version everywhere. Add a MIN_MACOS_VERSION variable. Update it and sanity check it according to CMAKE_OSX_DEPLOYMENT_TARGET and our Qt version. Use it to set our minimum macOS version in various places. Change-Id: Icaf0dbe463f34d182986868021e2b56d2239da38 Reviewed-on: https://code.wireshark.org/review/31048 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-14 19:30:39 +00:00
# https://doc.qt.io/qt-5.11/supported-platforms-and-configurations.html
CMake: macOS version updates. Set MIN_MACOS_VERSION to 10.14 if we're building with Qt 6.0 or later. Print both our deployment target and our base SDK at configure time.
2020-12-19 19:23:57 +00:00
# https://doc.qt.io/qt-5.15/supported-platforms.html
# https://doc-snapshots.qt.io/qt6-dev/supported-platforms.html
CMake: Bump minimum CMake version to 3.10 Linux distributions that have a version less than 3.10 are either almost at end of support (Debian Stretch), or will be supported by Wireshark 3.6 LTS (RHEL 7, SLES 12). The Windows minimum is already 3.13. Increasing the minimum required means that policies CMP0069 and CMP0071 are automatically set to NEW, and we can use VERSION_GREATER_EQUAL. Fix an error in the Qt version comparison; it's Qt 5.14 that first required macOS 10.13 High Sierra, not Qt 5.15.
2022-04-22 00:19:56 +00:00
if(Qt${qtver}Widgets_VERSION VERSION_GREATER_EQUAL "6.0.0")
CMake: macOS version updates. Set MIN_MACOS_VERSION to 10.14 if we're building with Qt 6.0 or later. Print both our deployment target and our base SDK at configure time.
2020-12-19 19:23:57 +00:00
set(MIN_MACOS_VERSION 10.14)
CMake: Bump minimum CMake version to 3.10 Linux distributions that have a version less than 3.10 are either almost at end of support (Debian Stretch), or will be supported by Wireshark 3.6 LTS (RHEL 7, SLES 12). The Windows minimum is already 3.13. Increasing the minimum required means that policies CMP0069 and CMP0071 are automatically set to NEW, and we can use VERSION_GREATER_EQUAL. Fix an error in the Qt version comparison; it's Qt 5.14 that first required macOS 10.13 High Sierra, not Qt 5.15.
2022-04-22 00:19:56 +00:00
elseif(Qt5Widgets_VERSION VERSION_GREATER_EQUAL "5.14.0")
CMake: Add a MIN_MACOS_VERSION check for Qt 5.15. According to https://doc.qt.io/qt-5/supported-platforms.html, Qt 5.15 supports macOS 10.13 - 10.15. Change-Id: Iecd9b6f10d6b968ad145d247e934fddec25658f7 Reviewed-on: https://code.wireshark.org/review/37330 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <gharris@sonic.net>
2020-05-27 22:00:46 +00:00
set(MIN_MACOS_VERSION 10.13)
CMake: Bump minimum CMake version to 3.10 Linux distributions that have a version less than 3.10 are either almost at end of support (Debian Stretch), or will be supported by Wireshark 3.6 LTS (RHEL 7, SLES 12). The Windows minimum is already 3.13. Increasing the minimum required means that policies CMP0069 and CMP0071 are automatically set to NEW, and we can use VERSION_GREATER_EQUAL. Fix an error in the Qt version comparison; it's Qt 5.14 that first required macOS 10.13 High Sierra, not Qt 5.15.
2022-04-22 00:19:56 +00:00
elseif(Qt5Widgets_VERSION VERSION_GREATER_EQUAL "5.12.0")
CMake: Make sure we use the same minimum macOS version everywhere. Add a MIN_MACOS_VERSION variable. Update it and sanity check it according to CMAKE_OSX_DEPLOYMENT_TARGET and our Qt version. Use it to set our minimum macOS version in various places. Change-Id: Icaf0dbe463f34d182986868021e2b56d2239da38 Reviewed-on: https://code.wireshark.org/review/31048 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-14 19:30:39 +00:00
set(MIN_MACOS_VERSION 10.12)
CMake: Bump minimum CMake version to 3.10 Linux distributions that have a version less than 3.10 are either almost at end of support (Debian Stretch), or will be supported by Wireshark 3.6 LTS (RHEL 7, SLES 12). The Windows minimum is already 3.13. Increasing the minimum required means that policies CMP0069 and CMP0071 are automatically set to NEW, and we can use VERSION_GREATER_EQUAL. Fix an error in the Qt version comparison; it's Qt 5.14 that first required macOS 10.13 High Sierra, not Qt 5.15.
2022-04-22 00:19:56 +00:00
elseif(Qt5Widgets_VERSION VERSION_GREATER_EQUAL "5.10.0")
CMake: Make sure we use the same minimum macOS version everywhere. Add a MIN_MACOS_VERSION variable. Update it and sanity check it according to CMAKE_OSX_DEPLOYMENT_TARGET and our Qt version. Use it to set our minimum macOS version in various places. Change-Id: Icaf0dbe463f34d182986868021e2b56d2239da38 Reviewed-on: https://code.wireshark.org/review/31048 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-14 19:30:39 +00:00
set(MIN_MACOS_VERSION 10.11)
endif()
if(CMAKE_OSX_DEPLOYMENT_TARGET AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS MIN_MACOS_VERSION)
Get CMake to successfully work with Qt6 Of course it still fails in the compile phase, but only for some of the ui/qt/ files. Wireshark with Qt5 still compiles and runs. To do the build invoke cmake with the following settings added: export CMAKE_PREFIX_PATH=:${MY_QT6_PREFIX}/lib/cmake cmake -DUSE_qt6=ON ... Independently of this patch there is lots of Qt-stuff in CMakeLists.txt that needs review/cleanup: - Some of the stuff can probably be solved in a less hacky way: + There seemed to be a way for QT6 to provide the required c++-standard, but in the end I could not find it. + Once we have a working Qt6 codebase, we may get rid of the USE_qt6 flag and just test for Qt6Core first and if not present check for Qt5Core. - All comments that match /qt ?[4-6]/i need reviewing/cleaning up. - The changes in this patch have been tested to work on all machines that are my mac (macos 12.0.1, XCode 13.1, Intel, GPL-Qt6.2.1 with only the macos package selected, cmake 3.21.4) Add ui/qt/qt6-migration-links.txt for some possibly helpful links
2021-11-18 00:29:59 +00:00
message(FATAL_ERROR "Qt version ${Qt${qtver}Widgets_VERSION} requires CMAKE_OSX_DEPLOYMENT_TARGET (${CMAKE_OSX_DEPLOYMENT_TARGET}) >= ${MIN_MACOS_VERSION}")
CMake: Make sure we use the same minimum macOS version everywhere. Add a MIN_MACOS_VERSION variable. Update it and sanity check it according to CMAKE_OSX_DEPLOYMENT_TARGET and our Qt version. Use it to set our minimum macOS version in various places. Change-Id: Icaf0dbe463f34d182986868021e2b56d2239da38 Reviewed-on: https://code.wireshark.org/review/31048 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-14 19:30:39 +00:00
endif()
CMake+macOS: Make sure we're using the right Qt tools. Qt5CoreConfigExtras.cmake sets Qt5::qmake. Use it to find the corresponding path to macdeployqt and use those in osx-app.sh. Change-Id: I2e67f0126e272fc95d40476b9bfc83ab38d73cee Reviewed-on: https://code.wireshark.org/review/28359 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-20 22:59:41 +00:00
endif()
Qt: Fix Qt 6.3 Visual Studio build Since Qt 6.3 the /permissive- option is required as otherwise the compilation fails on static assert: "On MSVC you must pass the /permissive- option to the compiler."
2022-07-10 10:25:57 +00:00
# Qt requires MSVC /permissive- option since 6.3 release
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND Qt${qtver}Widgets_VERSION VERSION_GREATER_EQUAL "6.3.0")
add_compile_options("/permissive-")
endif()
- Move setting _U_ into config.h, because a) C++ has a standardized way of marking parameters as unused b) cmakes autoquoting magic failed when the compiler wasn't gcc but moc instead. - qtshark: Don't try to compile the c source files inside ui/qt/ - qtshark: Only run moc on the files that need it. - qtshark: It's too early to try any of the new qtshark files as clean. - Make Qt detection actually work - Add C++ to the list of languages for this project svn path=/trunk/; revision=40807
2012-02-02 12:04:22 +00:00
endif()
Wait until the C and C++ compiler flags are fully set before showing them. That way, we report the *full* contents of those flags. Change-Id: Idab78049247c04b7d35a3ce804c8ea9daaf84312 Reviewed-on: https://code.wireshark.org/review/3364 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-02 20:53:44 +00:00
Add conflict check filter Set ENABLE_CHECK_FILTER to 1 for get list of display filter with conflict... Ping-Bug:2402 Change-Id: I8d56b1573120d1a29d437aae1088be242e15e9a3 Reviewed-on: https://code.wireshark.org/review/13644 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-01 20:33:33 +00:00
if(ENABLE_CHECKHF_CONFLICT)
set(ENABLE_CHECK_FILTER 1)
endif()
Put the Windows-specific system library settings in CMakeLists.txt. We already do that for the macOS-specific system libraries; do it for the Windows-specific system libraries as well. Change-Id: I4646cbf5043406a9b6be70307b51df2fbe0329dd Reviewed-on: https://code.wireshark.org/review/30066 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-08 03:38:51 +00:00
#
# Platform-specific additional libraries.
#
if(WIN32)
CMake: Adjust wsutil includes and linking. Mark wsutil's includes SYSTEM PRIVATE. This exposed a lot of targets that were indirectly picking up include paths via the wsutil target, so add direct includes where needed. The G.722 and G.726 codecs were implicilty including tiffio.h; find it explicitly instead. Mark some of wsutil's libraries PRIVATE, but leave commonly-used ones PUBLIC. Ping #17477.
2021-07-13 18:02:52 +00:00
set(WIN_COMCTL32_LIBRARY comctl32.lib)
set(WIN_IPHLPAPI_LIBRARY iphlpapi.lib)
Put the Windows-specific system library settings in CMakeLists.txt. We already do that for the macOS-specific system libraries; do it for the Windows-specific system libraries as well. Change-Id: I4646cbf5043406a9b6be70307b51df2fbe0329dd Reviewed-on: https://code.wireshark.org/review/30066 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-08 03:38:51 +00:00
set(WIN_PSAPI_LIBRARY psapi.lib)
set(WIN_VERSION_LIBRARY version.lib)
CMake: Adjust wsutil includes and linking. Mark wsutil's includes SYSTEM PRIVATE. This exposed a lot of targets that were indirectly picking up include paths via the wsutil target, so add direct includes where needed. The G.722 and G.726 codecs were implicilty including tiffio.h; find it explicitly instead. Mark some of wsutil's libraries PRIVATE, but leave commonly-used ones PUBLIC. Ping #17477.
2021-07-13 18:02:52 +00:00
set(WIN_WS2_32_LIBRARY ws2_32.lib)
Put the Windows-specific system library settings in CMakeLists.txt. We already do that for the macOS-specific system libraries; do it for the Windows-specific system libraries as well. Change-Id: I4646cbf5043406a9b6be70307b51df2fbe0329dd Reviewed-on: https://code.wireshark.org/review/30066 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-08 03:38:51 +00:00
endif()
Allow building under OSX Yosemite using cmake. CFPropertyListCreateFromStream() has been deprecated in Yosemite, in favor of CFPropertyListCreateWithStream(). The autotools build checks for the existence of the new function, but the cmake build does not. So, add a check for it to CMakeLists.txt, and update cmakeconfig.h.in to provide the "template" for HAVE_CFPROPERTYLISTCREATEWITHSTREAM. Change-Id: I1a4e3e1ce83092ecf7725527b921eeca80b18d4b Note: CFPropertyListCreateWithStream() works under Mavericks as well. Reviewed-on: https://code.wireshark.org/review/5226 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-11-10 20:24:18 +00:00
if(APPLE)
#
A bunch of "{Mac} OS X" -> "macOS" changes. Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X 10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS X" from 10.8 to 10.11. Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3 Reviewed-on: https://code.wireshark.org/review/20933 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-05 19:15:27 +00:00
# We assume that APPLE means macOS so that we have the macOS
Allow building under OSX Yosemite using cmake. CFPropertyListCreateFromStream() has been deprecated in Yosemite, in favor of CFPropertyListCreateWithStream(). The autotools build checks for the existence of the new function, but the cmake build does not. So, add a check for it to CMakeLists.txt, and update cmakeconfig.h.in to provide the "template" for HAVE_CFPROPERTYLISTCREATEWITHSTREAM. Change-Id: I1a4e3e1ce83092ecf7725527b921eeca80b18d4b Note: CFPropertyListCreateWithStream() works under Mavericks as well. Reviewed-on: https://code.wireshark.org/review/5226 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-11-10 20:24:18 +00:00
# frameworks.
#
Change some names to reflect Apple's new UNIX-for-Macs name. {OS_X,os_x} -> {MACOS,macos}. Change-Id: Icebea6ab566c65996ee97bacb88fac7e84ec32de Reviewed-on: https://code.wireshark.org/review/22161 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-16 08:49:44 +00:00
set(HAVE_MACOS_FRAMEWORKS 1)
Allow building under OSX Yosemite using cmake. CFPropertyListCreateFromStream() has been deprecated in Yosemite, in favor of CFPropertyListCreateWithStream(). The autotools build checks for the existence of the new function, but the cmake build does not. So, add a check for it to CMakeLists.txt, and update cmakeconfig.h.in to provide the "template" for HAVE_CFPROPERTYLISTCREATEWITHSTREAM. Change-Id: I1a4e3e1ce83092ecf7725527b921eeca80b18d4b Note: CFPropertyListCreateWithStream() works under Mavericks as well. Reviewed-on: https://code.wireshark.org/review/5226 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-11-10 20:24:18 +00:00
FIND_LIBRARY (APPLE_APPLICATION_SERVICES_LIBRARY ApplicationServices)
Qt: Fix MacOSX menu entries Remove various menu items added automatically on Mac OS X. The following menu items have been removed: - Edit / Start Dictation - Edit / Emoji & Symbols - View / Enter Fullscreen Mode - View / Show Tab Bar - Hide Tab Bar Bug: 13366 Change-Id: I44deae7ee8ea7a43926820e4f5d0517ece246939 Reviewed-on: https://code.wireshark.org/review/26823 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-09 09:39:49 +00:00
FIND_LIBRARY (APPLE_APPKIT_LIBRARY AppKit)
Allow building under OSX Yosemite using cmake. CFPropertyListCreateFromStream() has been deprecated in Yosemite, in favor of CFPropertyListCreateWithStream(). The autotools build checks for the existence of the new function, but the cmake build does not. So, add a check for it to CMakeLists.txt, and update cmakeconfig.h.in to provide the "template" for HAVE_CFPROPERTYLISTCREATEWITHSTREAM. Change-Id: I1a4e3e1ce83092ecf7725527b921eeca80b18d4b Note: CFPropertyListCreateWithStream() works under Mavericks as well. Reviewed-on: https://code.wireshark.org/review/5226 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-11-10 20:24:18 +00:00
FIND_LIBRARY (APPLE_CORE_FOUNDATION_LIBRARY CoreFoundation)
FIND_LIBRARY (APPLE_SYSTEM_CONFIGURATION_LIBRARY SystemConfiguration)
CMake: macOS version updates. Set MIN_MACOS_VERSION to 10.14 if we're building with Qt 6.0 or later. Print both our deployment target and our base SDK at configure time.
2020-12-19 19:23:57 +00:00
message(STATUS "Building for Mac OS X/OS X/macOS ${MIN_MACOS_VERSION} using SDK ${CMAKE_OSX_SYSROOT}")
Allow building under OSX Yosemite using cmake. CFPropertyListCreateFromStream() has been deprecated in Yosemite, in favor of CFPropertyListCreateWithStream(). The autotools build checks for the existence of the new function, but the cmake build does not. So, add a check for it to CMakeLists.txt, and update cmakeconfig.h.in to provide the "template" for HAVE_CFPROPERTYLISTCREATEWITHSTREAM. Change-Id: I1a4e3e1ce83092ecf7725527b921eeca80b18d4b Note: CFPropertyListCreateWithStream() works under Mavericks as well. Reviewed-on: https://code.wireshark.org/review/5226 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-11-10 20:24:18 +00:00
endif()
Move configure checks to ConfigureChecks.cmake svn path=/trunk/; revision=29585
2009-08-27 15:32:57 +00:00
include(ConfigureChecks.cmake)
Parts of http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1179 Frederic Heem: * More cmake system checks. It compiles dumpcap without running configure, svn path=/trunk/; revision=19672
2006-10-24 17:39:32 +00:00
CMake: Enable ccache for gcc and clang. Add an option to check for and use ccache. Disable it by default. Change-Id: Ifc928d22715b7e06e53115455b31dbeaf2ee8332 Reviewed-on: https://code.wireshark.org/review/18715 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-08 19:11:14 +00:00
# Global properties
Small style changes. svn path=/trunk/; revision=53701
2013-12-01 21:55:21 +00:00
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
Add CMake properties to targets so that they are logically organised when using a Visual Studio solution. Add CMake properties to group the source files in epan into logical blocks when using a Visual Studio solution. svn path=/trunk/; revision=52580
2013-10-13 09:21:55 +00:00
CMake: Don't restrict ENABLE_CCACHE. Don't restrict ENABLE_CCACHE, but print a warning for non-gcc and non-clang compilers. Fixes #16960.
2020-10-29 22:42:27 +00:00
if(ENABLE_CCACHE)
if(NOT (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang"))
# https://ccache.dev/platform-compiler-language-support.html
message(WARNING "Ccache is enabled, but your compiler is ${CMAKE_C_COMPILER_ID}."
" We wish you the best of luck.")
endif()
HTTPS In More Places, update some URLs. Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8 Reviewed-on: https://code.wireshark.org/review/34096 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-27 07:54:44 +00:00
# https://stackoverflow.com/questions/1815688/how-to-use-ccache-with-cmake/24305849#24305849
CMake: Enable ccache for gcc and clang. Add an option to check for and use ccache. Disable it by default. Change-Id: Ifc928d22715b7e06e53115455b31dbeaf2ee8332 Reviewed-on: https://code.wireshark.org/review/18715 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-11-08 19:11:14 +00:00
find_program(CCACHE_EXECUTABLE ccache)
if(CCACHE_EXECUTABLE)
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_EXECUTABLE}")
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "${CCACHE_EXECUTABLE}")
endif()
endif()
Add checkAPI calls to CMake. This generates a top level target, checkAPI, that is excluded from the ALL build target, so must be run separately. On Windows using a Visual Studio generator, call msbuild /p:Configuration=RelWithDebInfo checkAPI.vcxproj Change-Id: I44a57c564dcfc75499463b942436f4b920a82478 Reviewed-on: https://code.wireshark.org/review/14873 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-03-11 19:51:39 +00:00
# The top level checkAPIs target, add before subdirectory calls so it's avaiable to all
add_custom_target(checkAPI)
set_target_properties(checkAPI
PROPERTIES
FOLDER "Auxiliary"
EXCLUDE_FROM_ALL True
EXCLUDE_FROM_DEFAULT_BUILD True
)
Remove a few obsolete references to gtk from checkapi and faq.py Change-Id: Ice9aec64fddbed94c7be96575c6e1bc800e8ac9e Reviewed-on: https://code.wireshark.org/review/27067 Petri-Dish: Jörg Mayer <jmayer@loplof.de> Tested-by: Petri Dish Buildbot Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2018-04-21 11:35:08 +00:00
include( UseCheckAPI )
extcap: set EXTCAP_DIR in the root cmake file and propagate it. The EXTCAP_DIR must be known in the root file to be set in config.h and it's still needed in extcap/ to install the binaries, hence we need caching it as well. Bug: 14724 Change-Id: I58bac7de7a00e06c23fe8c8f1a7e3d299de6a560 Reviewed-on: https://code.wireshark.org/review/27776 Reviewed-by: Mikael Kanstrup <mikael.kanstrup@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-24 13:08:48 +00:00
# Target platform locations
# UN*X in general, including macOS if not building an app bundle:
# $DESTDIR/lib/wireshark/extcap
# Windows: $DESTDIR/extcap
# macOS app bundle: Wireshark.app/Contents/Resources/share/wireshark/extcap
CMake: Use $ORIGIN with RPATH Make our package relocatable on Unix systems. Linux, Solaris and FreeBSD are known to support $ORIGIN. Change-Id: Ibcdda33d62c075bfa867d006cb6aaf5824609011 Reviewed-on: https://code.wireshark.org/review/30896 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-03 05:32:17 +00:00
# If you change the nesting level be sure to check also the INSTALL_RPATH
# target property.
extcap: set EXTCAP_DIR in the root cmake file and propagate it. The EXTCAP_DIR must be known in the root file to be set in config.h and it's still needed in extcap/ to install the binaries, hence we need caching it as well. Bug: 14724 Change-Id: I58bac7de7a00e06c23fe8c8f1a7e3d299de6a560 Reviewed-on: https://code.wireshark.org/review/27776 Reviewed-by: Mikael Kanstrup <mikael.kanstrup@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-24 13:08:48 +00:00
if (WIN32)
Revert "wsutil: Use a separate "extlog" directory for Logwolf extcaps." This reverts commit 54553de59d24175ede07d3b423080cb9824c3360. As noted in !6694, it would probably make more sense to handle this a different way.
2022-04-18 23:46:20 +00:00
set(EXTCAP_INSTALL_LIBDIR "extcap" CACHE INTERNAL "The extcap dir")
extcap: set EXTCAP_DIR in the root cmake file and propagate it. The EXTCAP_DIR must be known in the root file to be set in config.h and it's still needed in extcap/ to install the binaries, hence we need caching it as well. Bug: 14724 Change-Id: I58bac7de7a00e06c23fe8c8f1a7e3d299de6a560 Reviewed-on: https://code.wireshark.org/review/27776 Reviewed-by: Mikael Kanstrup <mikael.kanstrup@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-24 13:08:48 +00:00
else ()
Revert "wsutil: Use a separate "extlog" directory for Logwolf extcaps." This reverts commit 54553de59d24175ede07d3b423080cb9824c3360. As noted in !6694, it would probably make more sense to handle this a different way.
2022-04-18 23:46:20 +00:00
set(EXTCAP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/extcap" CACHE INTERNAL "The extcap dir")
extcap: set EXTCAP_DIR in the root cmake file and propagate it. The EXTCAP_DIR must be known in the root file to be set in config.h and it's still needed in extcap/ to install the binaries, hence we need caching it as well. Bug: 14724 Change-Id: I58bac7de7a00e06c23fe8c8f1a7e3d299de6a560 Reviewed-on: https://code.wireshark.org/review/27776 Reviewed-by: Mikael Kanstrup <mikael.kanstrup@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-24 13:08:48 +00:00
endif()
CMake: Move the PLUGIN_PATH_ID definition. Define PLUGIN_PATH_ID where we use it. ENABLE_APPLICATION_BUNDLE is defined later on, so test for APPLE instead. Change-Id: I16c3ac3dc0e483fbf89cb1a2cacb2afb416d656f Reviewed-on: https://code.wireshark.org/review/32016 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-14 00:12:24 +00:00
if(APPLE)
#
# As https://developer.apple.com/library/archive/technotes/tn2206/_index.html
# says,
#
# "Note that a location where code is expected to reside cannot generally
# contain directories full of nested code, because those directories tend
# to be interpreted as bundles. So this occasional practice is not
# recommended and not officially supported. If you do do this, do not use
# periods in the directory names. The code signing machinery interprets
# directories with periods in their names as code bundles and will reject
# them if they don't conform to the expected code bundle layout."
#
set(PLUGIN_PATH_ID "${PROJECT_MAJOR_VERSION}-${PROJECT_MINOR_VERSION}")
else()
set(PLUGIN_PATH_ID "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}")
endif()
CMake: Clean up and homogenize plugin dir configuration Change-Id: If43c7b124afdf6471164675f8a0c55a76e998ea1 Reviewed-on: https://code.wireshark.org/review/29254 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-21 21:23:46 +00:00
# Directory where plugins and Lua dissectors can be found.
if(WIN32)
set(PLUGIN_INSTALL_LIBDIR "plugins" CACHE INTERNAL "The plugin dir")
else()
CMake: Fix DOCDIR on Unix User guides are installed to doc/Wireshark. Use doc/wireshark instead. Remove leftover variable CPACK_PACKAGE_NAME. Change-Id: I9a1d6bdc7d8f0b48c61e43679285d5ba83904a63 Reviewed-on: https://code.wireshark.org/review/31851 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-02-01 16:25:24 +00:00
set(PLUGIN_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/plugins" CACHE INTERNAL "The plugin dir")
CMake: Clean up and homogenize plugin dir configuration Change-Id: If43c7b124afdf6471164675f8a0c55a76e998ea1 Reviewed-on: https://code.wireshark.org/review/29254 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-21 21:23:46 +00:00
endif()
macOS: Fix our plugin path. In CMake we only used PROJECT_RELEASE_VERSION to construct our plugin path, so rename it to PLUGIN_PATH_ID. Use a dash to separate version numbers on macOS in order to allow code signing and a period elsewhere. In the C code we only used VERSION_RELEASE to construct our plugin path, so rename it to PLUGIN_PATH_ID. Change-Id: I02abc591d7857269e8d47b414b61df4b28a25f2d Reviewed-on: https://code.wireshark.org/review/32013 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-13 19:08:19 +00:00
set(PLUGIN_INSTALL_VERSION_LIBDIR "${PLUGIN_INSTALL_LIBDIR}/${PLUGIN_PATH_ID}")
set(PLUGIN_VERSION_DIR "plugins/${PLUGIN_PATH_ID}")
CMake: Clean up and homogenize plugin dir configuration Change-Id: If43c7b124afdf6471164675f8a0c55a76e998ea1 Reviewed-on: https://code.wireshark.org/review/29254 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-21 21:23:46 +00:00
Merge the caputils/ and capchild/ directories The distinction between the different kinds of capture utility may not warrant a special subfolfer for each, and sometimes the distinction is not be clear or some functions could stradle multiple "categories" (like capture_ifinfo.[ch]). Simplify by having only a generic 'capture' subfolder. The separate CMake libraries are kept as a way to reuse object code efficiently.
2021-03-24 22:09:19 +00:00
add_subdirectory( capture )
Add doc/CMakeLists.txt Change-Id: I387e893dc5b8b38569f7189d078fdc1853ba012f Reviewed-on: https://code.wireshark.org/review/14269 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-02-29 14:48:57 +00:00
add_subdirectory( doc )
Switch from AsciiDoc to Asciidoctor. Switch the markup text processor for files in the docbook directory from AsciiDoc to Asciidoctor. Asciidoctor has several useful features (such as direct PDF output) and is actively developed. It's written in Ruby but that dependency can be sidestepped with AsciidoctorJ, a self-contained bundle that only depends on the JRE. The current toolchain targets require Python, AsciiDoc, DocBook XML, DocBook XSL, Java, FOP, xsltproc, lynx, and the HTMLHelp compiler: HTML: AsciiDoc → DocBook XML → xsltproc + DocBook XSL Chunked HTML: AsciiDoc → DocBook XML → xsltproc + DocBook XSL PDF: AsciiDoc → DocBook XML → xsltproc + DocBook XSL → FOP HTMLHelp: AsciiDoc → DocBook XML → xsltproc + DocBook XSL → HHC This change removes the AsciiDoc and FOP requirements and adds either AsciidoctorJ or Asciidoctor + Ruby: HTML: Asciidoctor → DocBook XML → xsltproc + DocBook XSL Chunked HTML: Asciidoctor → DocBook XML → xsltproc + DocBook XSL PDF: Asciidoctor HTMLHelp: Asciidoctor → DocBook XML → xsltproc + DocBook XSL → HHC Ideally we could generate all of these using AsciidoctorJ, Java, and lynx. Unfortunately we're not there yet. The release notes depend on several macros (ws-buglink, ws-salink, cve-idlink, sort-and-group). Add Asciidoctor (Ruby) equivalents. Remove the BUILD_xxx_GUIDES CMake options and add various output targets automatically. This means that you have to build the various documentation targets explicitly. Change-Id: I31930677a656b99b1c6839bb6c33a13db951eb9a Reviewed-on: https://code.wireshark.org/review/25668 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-19 22:03:55 +00:00
add_subdirectory( docbook EXCLUDE_FROM_ALL )
Group subdirectories svn path=/trunk/; revision=30462
2009-10-10 05:57:25 +00:00
add_subdirectory( epan )
cmake: move extcap sections to extcap/CMakeLists.txt. Change-Id: Ie7d9f6ad3d8b788e0d22e3ce15159fc46f5a93e8 Reviewed-on: https://code.wireshark.org/review/27638 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-17 12:41:15 +00:00
add_subdirectory( extcap )
Build the extcap programs in the extcap directory. That lets the version of Wireshark built with autotools find the extcap programs. Don't install the extcap programs under ${datadir} - that puts it under a share directory, and share directories are for platform-independent files, which executable images aren't (they're instruction-set dependent, hence platform-dependent). Change-Id: I992eeb984bdbe6b3476777f7114628c83df6080f Reviewed-on: https://code.wireshark.org/review/13943 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-15 01:00:38 +00:00
add_subdirectory( randpkt_core )
Rewrite make-{dissectors,taps} in Python Having these build tools in machine code poses problems when cross-compiling. The most significant being that we need to find the host and build GLiB dependencies at compile-time. There is no noticeable speed difference between the Python and C implementation. Ping-Bug: 14622 Change-Id: Id13f823c7f4abf51edfa291e703028873748989f Reviewed-on: https://code.wireshark.org/review/28130 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-06-08 17:09:11 +00:00
add_subdirectory( tools/lemon )
tools/radiotap-gen: Add a sample program for generation radiotap headers. This program generates complete pcap files containing the proposed U-SIG radiotap TLVs along with enough else to make it readable. You cannot currently read such packets with tshark or wireshark until I add U-SIG handling to Wireshark.
2022-03-18 01:41:12 +00:00
add_subdirectory( tools/radiotap-gen )
TShark links with libui so we should always build it. svn path=/trunk/; revision=51101
2013-08-01 23:40:06 +00:00
add_subdirectory( ui )
Group subdirectories svn path=/trunk/; revision=30462
2009-10-10 05:57:25 +00:00
add_subdirectory( wiretap )
Put pcapio.c into a writecap library, and use it. Change-Id: Ib89f345c072a38bc01f0513366a4bdae3bf6f08e Reviewed-on: https://code.wireshark.org/review/14615 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-24 20:00:07 +00:00
add_subdirectory( writecap )
Revert "CMake: Fix Windows help install target" This reverts commit 8992760c68f3e508a0e5a25307c246a75f7c2ae2. Breaks the "make clean" target as it tries to remove the "help" directory. Since this change, the macOS builds started failing tests as well (init.lua and colorfilters seems not to be applied). Change-Id: I3fce346e04875e667680a4ed9ba3beca8054a168 Reviewed-on: https://code.wireshark.org/review/30950 Reviewed-by: João Valverde <j@v6e.pt>
2018-12-07 01:01:28 +00:00
# Location of our data files. This should be set to a value that allows
# running from the build directory on Windows, on macOS when building an
# application bundle, and on UNIX in general if
# WIRESHARK_RUN_FROM_BUILD_DIRECTORY is set.
if(ENABLE_APPLICATION_BUNDLE)
if(CMAKE_CFG_INTDIR STREQUAL ".")
set(_datafile_dir "${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Resources/share/wireshark")
else()
# Xcode
set(_datafile_dir "${CMAKE_BINARY_DIR}/run/${CMAKE_CFG_INTDIR}/Wireshark.app/Contents/Resources/share/wireshark")
endif()
elseif(NOT CMAKE_CFG_INTDIR STREQUAL ".")
# Visual Studio, Xcode, etc.
set(_datafile_dir "${CMAKE_BINARY_DIR}/run/${CMAKE_CFG_INTDIR}")
else()
# Makefile, Ninja, etc.
set(_datafile_dir "${CMAKE_BINARY_DIR}/run")
endif()
set(DATAFILE_DIR ${_datafile_dir} CACHE INTERNAL "Build time data file location.")
Add a default configuration profile for Logray. Add and install default coloring rules and filter buttons for Logray. Add is_packet_configuration_namespace() and use it to set the default timestamp type for Logray to "Absolute", which is more appropriate for log entries.
2022-06-17 22:22:26 +00:00
if(ENABLE_APPLICATION_BUNDLE)
if(CMAKE_CFG_INTDIR STREQUAL ".")
set(_log_datafile_dir "${CMAKE_BINARY_DIR}/run/Logray.app/Contents/Resources/share/logray")
else()
# Xcode
set(_log_datafile_dir "${CMAKE_BINARY_DIR}/run/${CMAKE_CFG_INTDIR}/Logray.app/Contents/Resources/share/logray")
endif()
set(LOG_DATAFILE_DIR ${_log_datafile_dir} CACHE INTERNAL "Build time log analysis data file location.")
# XXX We need to update wsutil/filesystem.c and packaging/nsis/*logray* to match.
# elseif(NOT CMAKE_CFG_INTDIR STREQUAL ".")
# # Visual Studio, Xcode, etc.
# set(_log_datafile_dir "${CMAKE_BINARY_DIR}/run/${CMAKE_CFG_INTDIR}/share/logray")
# else()
# # Makefile, Ninja, etc.
# set(_log_datafile_dir "${CMAKE_BINARY_DIR}/run/share/logray")
endif()
Revert "CMake: Fix Windows help install target" This reverts commit 8992760c68f3e508a0e5a25307c246a75f7c2ae2. Breaks the "make clean" target as it tries to remove the "help" directory. Since this change, the macOS builds started failing tests as well (init.lua and colorfilters seems not to be applied). Change-Id: I3fce346e04875e667680a4ed9ba3beca8054a168 Reviewed-on: https://code.wireshark.org/review/30950 Reviewed-by: João Valverde <j@v6e.pt>
2018-12-07 01:01:28 +00:00
# wsutil must be added after DATAFILE_DIR is set such that filesystem.c can
# learn about the directory location.
Group subdirectories svn path=/trunk/; revision=30462
2009-10-10 05:57:25 +00:00
add_subdirectory( wsutil )
Qt → wireshark. GTK+ → wireshark-gtk. Make sure the Qt UI is named "Wireshark" and its executable is named "wireshark" or "wireshark.exe". Make sure the GTK+ UI is named "Wireshark 1" or "Wireshark (GTK+)" depending on how much the target audience is likely to care about UI toolkits. Make sure the GTK+ executable is named "wireshark-gtk" or "wireshark-gtk.exe". It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps package. It's likely even more broken now. Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake 1.11.3) at some point. The first attempt to compile in ui/qt returns "error: source_file.cpp: No such file or directory". The second attempt works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1). Tested: - Nmake builds - NSIS packaging - CMake builds (Windows, OS X) - Autotools build and distcheck - RPM packaging To do: - Test Debian packaging - Fix PortableApps Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2 Reviewed-on: https://code.wireshark.org/review/3919 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-28 23:48:53 +00:00
if(BUILD_wireshark AND QT_FOUND)
Prepare the cmake infrastucture for eventually building wireshark and qtshark simultanously. The "only" missing thing for this is now ui/qt/CMakeLists.txt ;) svn path=/trunk/; revision=40799
2012-02-02 00:46:02 +00:00
add_subdirectory( ui/qt )
endif()
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
if(BUILD_logray AND QT_FOUND)
add_subdirectory( ui/logray )
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
endif()
cmake: Fix building with plugins disabled When Lua is enabled, scripts can still be loaded from the plugin dir (filesystem.c uses PLUGIN_INSTALL_DIR), so be sure to set it or the cmake build fails. Change-Id: I87d2d705434052220f9619438c90905c24b2a3a6 Reviewed-on: https://code.wireshark.org/review/18976 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-28 23:44:56 +00:00
# Location of our plugins. PLUGIN_DIR should allow running
CMake: Set an output directory for plugins. Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all platforms. Add WiresharkPlugin.cmake so that we can start defining common macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds. Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2 Reviewed-on: https://code.wireshark.org/review/6640 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-18 21:27:13 +00:00
# from the build directory similar to DATAFILE_DIR above.
if(ENABLE_PLUGINS)
CMake: Make "install ... DESTINATION" paths relative. Make sure we use relative destination paths in each install command. Apparently many CPack generators don't support absolute paths, particularly on Windows. This fixes the following error when running `cpack -G WIX` here: ---- CPack: Create package using WIX CPack: Install projects CPack: - Install project: Wireshark CMake Error at C:/Development/wireshark/cmbuild/cmake_install.cmake:206 (message): ABSOLUTE path INSTALL DESTINATION forbidden (by caller): C:/Program Files/Wireshark/lib/wireshark/extcap/androiddump.exe CPack Error: Error when generating package: wireshark ---- Change-Id: Ifdcd40814df8163ea722a65ef55acc1a511b2f75 Reviewed-on: https://code.wireshark.org/review/12657 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-12-04 19:12:45 +00:00
# Target platform locations
A bunch of "{Mac} OS X" -> "macOS" changes. Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X 10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS X" from 10.8 to 10.11. Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3 Reviewed-on: https://code.wireshark.org/review/20933 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-05 19:15:27 +00:00
# UN*X in general, including macOS if not building an app bundle:
# $DESTDIR/lib/wireshark/plugins/$VERSION
Fix build paths for cmake's Xcode project generator on macOS. Multi-configuration generators (such as Xcode or VS) append the current build configuration to most paths (eg. Debug/Release). Currently this results in inconsistent paths for the application bundle and the included command line tools. This commit sets the correct path information for multi-configuration generators for macOS application bundles. The standard Makefile behaviour is untouched. One Windows specific configuration was changed, as it was conflicting with these changes. This needs to be checked before merging. Additionally the wrapper scripts are omitted for Xcode, as the path to the binaries depends on the configuration chosen in Xcode. Therefore it is not viable to create these scripts in the cmake run. Bug: 11816 Change-Id: Ib43d82eb04600a0e2f2b020afb44b579ffc7a7c9 Reviewed-on: https://code.wireshark.org/review/28291 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-15 10:44:47 +00:00
# Windows: $DESTDIR/wireshark/plugins/$VERSION
A bunch of "{Mac} OS X" -> "macOS" changes. Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X 10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS X" from 10.8 to 10.11. Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3 Reviewed-on: https://code.wireshark.org/review/20933 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-05 19:15:27 +00:00
# macOS app bundle: Wireshark.app/Contents/PlugIns/wireshark
CMake: Set an output directory for plugins. Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all platforms. Add WiresharkPlugin.cmake so that we can start defining common macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds. Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2 Reviewed-on: https://code.wireshark.org/review/6640 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-18 21:27:13 +00:00
set(HAVE_PLUGINS 1)
CMake: Add a top-level nsis_package target. Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include file. Add macros to generate packaging-related targets and invoke them from the top-level CMakeLists.txt. Add a top-level "plugins" target. Copy plugins to "plugins" in each of our staging directories instead of "plugins/$VERSION". Add missing files to the copy_data_files and copy_cli_dlls targets. Add all files in the NSIS package from the staging directory. Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT. Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa Reviewed-on: https://code.wireshark.org/review/6459 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
add_custom_target(plugins)
set_target_properties(plugins PROPERTIES FOLDER "Plugins")
CMake: Set an output directory for plugins. Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all platforms. Add WiresharkPlugin.cmake so that we can start defining common macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds. Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2 Reviewed-on: https://code.wireshark.org/review/6640 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-18 21:27:13 +00:00
set(PLUGIN_SRC_DIRS
plugins: Add source tree subfolder for plugin library This allows some simplification and makes things more consistent, particularly for loading plugins from the build dir. Also fixes the issue reported here: https://www.wireshark.org/lists/wireshark-dev/201801/msg00061.html Change-Id: I0d8a000ee679172bccad546a3b0c47a79486f44d Reviewed-on: https://code.wireshark.org/review/25329 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: João Valverde <j@v6e.pt>
2018-01-15 12:40:55 +00:00
plugins/epan/ethercat
plugins/epan/gryphon
plugins/epan/irda
plugins/epan/mate
plugins/epan/opcua
plugins/epan/profinet
plugins/epan/stats_tree
plugins/epan/transum
plugins/epan/unistim
plugins/epan/wimax
plugins/epan/wimaxasncp
plugins/epan/wimaxmacphy
usbdump: Add usbdump wiretap plugin as functional example This wiretap plugin serves a dual purpose. One is to add usbdump file reading capability to wiretap and therefore Wireshark and Tshark. Second it is an illustration of a basic wiretap plugin module. Change-Id: Iefbb156ea1bc5d90dabc1753942cdb9e393714ad Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/25487 Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-26 23:46:32 +00:00
plugins/wiretap/usbdump
Move codec plugins to /plugins Change-Id: I56d61e2ef737e4326080d75a2302c73a4075e8a1 Reviewed-on: https://code.wireshark.org/review/33067 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-03 01:07:26 +00:00
plugins/codecs/G711
L16_mono: Add L16 monaural codec plugin as functional example This codec plugin serves a dual purpose. First it is to add L16 codec suppport to Wireshark. Second it is an illustration of a basic codec plugin module. Change-Id: I64394dab3257ae49dece0257b16cd969503918e2 Reviewed-on: https://code.wireshark.org/review/26131 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-27 07:22:25 +00:00
plugins/codecs/l16_mono
CMake: Set an output directory for plugins. Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all platforms. Add WiresharkPlugin.cmake so that we can start defining common macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds. Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2 Reviewed-on: https://code.wireshark.org/review/6640 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-18 21:27:13 +00:00
${CUSTOM_PLUGIN_SRC_DIR}
)
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
set(LOGRAY_PLUGIN_SRC_DIRS)
Rename Sysdig Bridge to Falco Bridge. The Sysdig Bridge plugin loads Falco plugins, so rename it to Falco Bridge. Make it optional and dependent on libsinsp+libscap, similar to our codec plugins. Remove some unused code.
2022-03-10 20:21:12 +00:00
if(SINSP_FOUND)
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
list(APPEND LOGRAY_PLUGIN_SRC_DIRS
Rename Sysdig Bridge to Falco Bridge. The Sysdig Bridge plugin loads Falco plugins, so rename it to Falco Bridge. Make it optional and dependent on libsinsp+libscap, similar to our codec plugins. Remove some unused code.
2022-03-10 20:21:12 +00:00
plugins/epan/falco_bridge
)
endif()
Move codec plugins to /plugins Change-Id: I56d61e2ef737e4326080d75a2302c73a4075e8a1 Reviewed-on: https://code.wireshark.org/review/33067 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-03 01:07:26 +00:00
if(SPANDSP_FOUND)
list(APPEND PLUGIN_SRC_DIRS
plugins/codecs/G722
plugins/codecs/G726
)
endif()
if(BCG729_FOUND)
list(APPEND PLUGIN_SRC_DIRS
plugins/codecs/G729
)
endif()
RTP: decode iLBC payload It is possible to decode iLBC payload. It uses libilbc library (https://github.com/TimothyGu/libilbc). Bug: 16314 Change-Id: Id4cad7ae32305a0e94ef32beb24e07733d7f834e Reviewed-on: https://code.wireshark.org/review/35686 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-18 22:55:25 +00:00
if(ILBC_FOUND)
list(APPEND PLUGIN_SRC_DIRS
plugins/codecs/iLBC
)
endif()
RTP: opus playback It's possible to play opus payload with libopus (https://opus-codec.org/). Closes #16882. Helped-by: Pascal Quantin <pascal.quantin@gmail.com> Signed-off-by: Lin Sun <lin.sun@zoom.us> Signed-off-by: Yuanzhi Li <ryanlee@mail.ustc.edu.cn>
2020-09-29 04:33:06 +00:00
if(OPUS_FOUND)
list(APPEND PLUGIN_SRC_DIRS
plugins/codecs/opus_dec
)
endif()
Move codec plugins to /plugins Change-Id: I56d61e2ef737e4326080d75a2302c73a4075e8a1 Reviewed-on: https://code.wireshark.org/review/33067 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-03 01:07:26 +00:00
if(SBC_FOUND)
list(APPEND PLUGIN_SRC_DIRS
plugins/codecs/sbc
)
endif()
PluginIF: AdditionalToolbar Creates an interface for plugins and other parts of the code, to add a new toolbar to the system and have various widget types interact with this toolbar. All toolbars added via this interface, will be added to an additional submenu called "Additional Toolbars" within Wireshark. Also a demo plugin is being provided, demonstrating various features of the toolbar, including updating the gui elements. It also demonstrates how to update toolbar items. Change-Id: I8d0351224b3d7f4b90220d58970b51695551d7e3 Reviewed-on: https://code.wireshark.org/review/19803 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-01-24 16:34:07 +00:00
# Build demo plugin, only if asked explicitly
if(ENABLE_PLUGIN_IFDEMO)
set(PLUGIN_SRC_DIRS
${PLUGIN_SRC_DIRS}
Update paths after dissector plugin move. With the change in paths of the dissector plugins in the repository some other paths require adjustment. These are the obvious changes remaining. Change-Id: Id49ac6aaf1a29d9eb37f4c32226a4597d5e32edd Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-on: https://code.wireshark.org/review/25343 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-01-16 15:59:28 +00:00
plugins/epan/pluginifdemo
PluginIF: AdditionalToolbar Creates an interface for plugins and other parts of the code, to add a new toolbar to the system and have various widget types interact with this toolbar. All toolbars added via this interface, will be added to an additional submenu called "Additional Toolbars" within Wireshark. Also a demo plugin is being provided, demonstrating various features of the toolbar, including updating the gui elements. It also demonstrates how to update toolbar items. Change-Id: I8d0351224b3d7f4b90220d58970b51695551d7e3 Reviewed-on: https://code.wireshark.org/review/19803 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-01-24 16:34:07 +00:00
)
endif()
CMake: Set an output directory for plugins. Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all platforms. Add WiresharkPlugin.cmake so that we can start defining common macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds. Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2 Reviewed-on: https://code.wireshark.org/review/6640 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-18 21:27:13 +00:00
else()
set(PLUGIN_SRC_DIRS )
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
set(LOGRAY_PLUGIN_SRC_DIRS )
CMake: Set an output directory for plugins. Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all platforms. Add WiresharkPlugin.cmake so that we can start defining common macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds. Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2 Reviewed-on: https://code.wireshark.org/review/6640 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-18 21:27:13 +00:00
endif()
if(ENABLE_APPLICATION_BUNDLE)
Fix build paths for cmake's Xcode project generator on macOS. Multi-configuration generators (such as Xcode or VS) append the current build configuration to most paths (eg. Debug/Release). Currently this results in inconsistent paths for the application bundle and the included command line tools. This commit sets the correct path information for multi-configuration generators for macOS application bundles. The standard Makefile behaviour is untouched. One Windows specific configuration was changed, as it was conflicting with these changes. This needs to be checked before merging. Additionally the wrapper scripts are omitted for Xcode, as the path to the binaries depends on the configuration chosen in Xcode. Therefore it is not viable to create these scripts in the cmake run. Bug: 11816 Change-Id: Ib43d82eb04600a0e2f2b020afb44b579ffc7a7c9 Reviewed-on: https://code.wireshark.org/review/28291 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-15 10:44:47 +00:00
if(CMAKE_CFG_INTDIR STREQUAL ".")
macOS: Fix our plugin path. In CMake we only used PROJECT_RELEASE_VERSION to construct our plugin path, so rename it to PLUGIN_PATH_ID. Use a dash to separate version numbers on macOS in order to allow code signing and a period elsewhere. In the C code we only used VERSION_RELEASE to construct our plugin path, so rename it to PLUGIN_PATH_ID. Change-Id: I02abc591d7857269e8d47b414b61df4b28a25f2d Reviewed-on: https://code.wireshark.org/review/32013 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-13 19:08:19 +00:00
set(_plugin_dir "${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark/${PLUGIN_PATH_ID}")
Fix build paths for cmake's Xcode project generator on macOS. Multi-configuration generators (such as Xcode or VS) append the current build configuration to most paths (eg. Debug/Release). Currently this results in inconsistent paths for the application bundle and the included command line tools. This commit sets the correct path information for multi-configuration generators for macOS application bundles. The standard Makefile behaviour is untouched. One Windows specific configuration was changed, as it was conflicting with these changes. This needs to be checked before merging. Additionally the wrapper scripts are omitted for Xcode, as the path to the binaries depends on the configuration chosen in Xcode. Therefore it is not viable to create these scripts in the cmake run. Bug: 11816 Change-Id: Ib43d82eb04600a0e2f2b020afb44b579ffc7a7c9 Reviewed-on: https://code.wireshark.org/review/28291 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-15 10:44:47 +00:00
else()
Fix directory containing compiled plugins in macOS. They weren't getting put in the version-number subdirectory, so the plugin loader wasn't finding them. If that causes problems with codesign, then we need to either 1) figure out how to make it work with codesign or 2) for macOS, not put plugins in a version-number subdirectory ***AND*** change the plugin loading process not to look for compiled in a version-number subdirectory. Change-Id: I58d344b728d05369d35edef4e4e530f10034e930 Reviewed-on: https://code.wireshark.org/review/32000 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-02-13 03:02:07 +00:00
# Xcode
macOS: Fix our plugin path. In CMake we only used PROJECT_RELEASE_VERSION to construct our plugin path, so rename it to PLUGIN_PATH_ID. Use a dash to separate version numbers on macOS in order to allow code signing and a period elsewhere. In the C code we only used VERSION_RELEASE to construct our plugin path, so rename it to PLUGIN_PATH_ID. Change-Id: I02abc591d7857269e8d47b414b61df4b28a25f2d Reviewed-on: https://code.wireshark.org/review/32013 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-13 19:08:19 +00:00
set(_plugin_dir "${CMAKE_BINARY_DIR}/run/$<CONFIG>/Wireshark.app/Contents/PlugIns/wireshark/${PLUGIN_PATH_ID}")
Fix build paths for cmake's Xcode project generator on macOS. Multi-configuration generators (such as Xcode or VS) append the current build configuration to most paths (eg. Debug/Release). Currently this results in inconsistent paths for the application bundle and the included command line tools. This commit sets the correct path information for multi-configuration generators for macOS application bundles. The standard Makefile behaviour is untouched. One Windows specific configuration was changed, as it was conflicting with these changes. This needs to be checked before merging. Additionally the wrapper scripts are omitted for Xcode, as the path to the binaries depends on the configuration chosen in Xcode. Therefore it is not viable to create these scripts in the cmake run. Bug: 11816 Change-Id: Ib43d82eb04600a0e2f2b020afb44b579ffc7a7c9 Reviewed-on: https://code.wireshark.org/review/28291 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-15 10:44:47 +00:00
endif()
wsutil: Add configuration namespaces. Rename init_progfile_dir to configuration_init. Add an argument which specifies our configuration namespace, which can be "Wireshark" (default) or "Logwolf".
2022-02-20 20:09:34 +00:00
if(CMAKE_CFG_INTDIR STREQUAL ".")
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
set(_logray_plugin_dir "${CMAKE_BINARY_DIR}/run/Logray.app/Contents/PlugIns/logray/${PLUGIN_PATH_ID}")
wsutil: Add configuration namespaces. Rename init_progfile_dir to configuration_init. Add an argument which specifies our configuration namespace, which can be "Wireshark" (default) or "Logwolf".
2022-02-20 20:09:34 +00:00
else()
# Xcode
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
set(_logray_plugin_dir "${CMAKE_BINARY_DIR}/run/$<CONFIG>/Logray.app/Contents/PlugIns/logray/${PLUGIN_PATH_ID}")
wsutil: Add configuration namespaces. Rename init_progfile_dir to configuration_init. Add an argument which specifies our configuration namespace, which can be "Wireshark" (default) or "Logwolf".
2022-02-20 20:09:34 +00:00
endif()
Fix build paths for cmake's Xcode project generator on macOS. Multi-configuration generators (such as Xcode or VS) append the current build configuration to most paths (eg. Debug/Release). Currently this results in inconsistent paths for the application bundle and the included command line tools. This commit sets the correct path information for multi-configuration generators for macOS application bundles. The standard Makefile behaviour is untouched. One Windows specific configuration was changed, as it was conflicting with these changes. This needs to be checked before merging. Additionally the wrapper scripts are omitted for Xcode, as the path to the binaries depends on the configuration chosen in Xcode. Therefore it is not viable to create these scripts in the cmake run. Bug: 11816 Change-Id: Ib43d82eb04600a0e2f2b020afb44b579ffc7a7c9 Reviewed-on: https://code.wireshark.org/review/28291 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-15 10:44:47 +00:00
elseif(WIN32 AND NOT CMAKE_CFG_INTDIR STREQUAL ".")
set(_plugin_dir "${CMAKE_BINARY_DIR}/run/$<CONFIG>/${PLUGIN_VERSION_DIR}")
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
set(_logray_plugin_dir ${_plugin_dir})
CMake: Set an output directory for plugins. Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all platforms. Add WiresharkPlugin.cmake so that we can start defining common macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds. Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2 Reviewed-on: https://code.wireshark.org/review/6640 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-18 21:27:13 +00:00
else()
cmake: fix CMP0026 deprecation warning in CMake 3.9 Since CMake 3.9, all policies before CMP0036 emit a warning. Fix the warning by not relying on the old behavior (existence of the LOCATION property). Tested with Ninja, the cmake output, rules.ninja and build.ninja output is identical (minus the deprecation warning). Change-Id: I058699380b01a9c02d9b98fd485ce6ded427abe3 Reviewed-on: https://code.wireshark.org/review/23915 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-14 19:13:52 +00:00
set(_plugin_dir "${DATAFILE_DIR}/${PLUGIN_VERSION_DIR}")
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
set(_logray_plugin_dir ${_plugin_dir})
CMake: Set an output directory for plugins. Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all platforms. Add WiresharkPlugin.cmake so that we can start defining common macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds. Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2 Reviewed-on: https://code.wireshark.org/review/6640 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-18 21:27:13 +00:00
endif()
set (PLUGIN_DIR ${_plugin_dir} CACHE INTERNAL "Build time plugin location.")
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
set (LOGRAY_PLUGIN_DIR ${_logray_plugin_dir} CACHE INTERNAL "Build time Logray plugin location.")
CMake: Set an output directory for plugins. Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all platforms. Add WiresharkPlugin.cmake so that we can start defining common macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds. Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2 Reviewed-on: https://code.wireshark.org/review/6640 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-18 21:27:13 +00:00
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
foreach(_plugin_src_dir ${PLUGIN_SRC_DIRS} ${LOGRAY_PLUGIN_SRC_DIRS})
CMake: Set an output directory for plugins. Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all platforms. Add WiresharkPlugin.cmake so that we can start defining common macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds. Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2 Reviewed-on: https://code.wireshark.org/review/6640 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-18 21:27:13 +00:00
add_subdirectory( ${_plugin_src_dir} )
endforeach()
cmake: allow VCSVERSION to be overridden with VCSVERSION_OVERRIDE The default VCSVERSION from make-version.pl is based on the "git archive" information (for tarballs) or uses "git describe" to discover the version. Distributors such as Debian who directly build from a Git repository might want to include a deterministic value, therefore add a new option to achieve this. Change-Id: I5a39670519f4d846020d917b124fc4d548d00137 Reviewed-on: https://code.wireshark.org/review/34100 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-07-27 16:10:39 +00:00
if(VCSVERSION_OVERRIDE)
# Allow distributors to override detection of the Git tag and version.
string(CONFIGURE "#define VCSVERSION \"@VCSVERSION_OVERRIDE@\"\n"
_version_h_contents ESCAPE_QUOTES)
Rename version.h to be more descriptive Version.h is too generic. This is specific to VCSVERSION and that should be made more obvious and discoverable.
2021-07-03 13:26:30 +00:00
file(WRITE "${CMAKE_BINARY_DIR}/vcs_version.h" "${_version_h_contents}")
cmake: allow VCSVERSION to be overridden with VCSVERSION_OVERRIDE The default VCSVERSION from make-version.pl is based on the "git archive" information (for tarballs) or uses "git describe" to discover the version. Distributors such as Debian who directly build from a Git repository might want to include a deterministic value, therefore add a new option to achieve this. Change-Id: I5a39670519f4d846020d917b124fc4d548d00137 Reviewed-on: https://code.wireshark.org/review/34100 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-07-27 16:10:39 +00:00
message(STATUS "VCSVERSION_OVERRIDE: ${VCSVERSION_OVERRIDE}")
else()
Rename version.h to be more descriptive Version.h is too generic. This is specific to VCSVERSION and that should be made more obvious and discoverable.
2021-07-03 13:26:30 +00:00
add_custom_target(vcs_version
BYPRODUCTS vcs_version.h
tools: Port make-version.pl to Python
2022-07-11 14:44:23 +00:00
COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_SOURCE_DIR}/tools/make-version.py
cmake: allow VCSVERSION to be overridden with VCSVERSION_OVERRIDE The default VCSVERSION from make-version.pl is based on the "git archive" information (for tarballs) or uses "git describe" to discover the version. Distributors such as Debian who directly build from a Git repository might want to include a deterministic value, therefore add a new option to achieve this. Change-Id: I5a39670519f4d846020d917b124fc4d548d00137 Reviewed-on: https://code.wireshark.org/review/34100 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-07-27 16:10:39 +00:00
${CMAKE_SOURCE_DIR}
)
Rename version.h to be more descriptive Version.h is too generic. This is specific to VCSVERSION and that should be made more obvious and discoverable.
2021-07-03 13:26:30 +00:00
set_target_properties(vcs_version PROPERTIES FOLDER "Auxiliary")
cmake: allow VCSVERSION to be overridden with VCSVERSION_OVERRIDE The default VCSVERSION from make-version.pl is based on the "git archive" information (for tarballs) or uses "git describe" to discover the version. Distributors such as Debian who directly build from a Git repository might want to include a deterministic value, therefore add a new option to achieve this. Change-Id: I5a39670519f4d846020d917b124fc4d548d00137 Reviewed-on: https://code.wireshark.org/review/34100 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-07-27 16:10:39 +00:00
endif()
Add CMake version.h dependency Remove the need for version.h.in and bring CMake up to par with autotools. Change-Id: I701b56c475f5fdec1f9a028536fff6992ce8eaca Reviewed-on: https://code.wireshark.org/review/15031 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-04-20 22:51:12 +00:00
More .in files to handle Change-Id: I55a04fe6f72c22f1a936ef45b215a8813f7a02db Reviewed-on: https://code.wireshark.org/review/2502 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-20 23:05:27 +00:00
set( configure_input "Built with CMake ${CMAKE_VERSION}" )
cmake/ Add some more (hackish) tests. Add a LICENSE file until I find the time to add it to all files individually. CMakeLists.txt Add some addiotional stuff regarding options. Add (non-working) code to generate config.h Handle GTK1 vs GTK2 and GLIB1 vs GLIB2 svn path=/trunk/; revision=19168
2006-09-06 22:28:19 +00:00
configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h)
cmake: rework version.h handling to treat it like config.h It wasn't working on my system: I kept seeing the old git revision in '...shark -v' even after deleting version.h Change-Id: I75f41a7afcee4b9384f33a56014e4af6b527fec5 Reviewed-on: https://code.wireshark.org/review/10265 Petri-Dish: Jörg Mayer <jmayer@loplof.de> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-08-26 04:50:09 +00:00
plugins: Minor interface improvement Change the plugin compatibility check to make it more convenient to define and check the major.minor Wireshark version. Change-Id: I2a6d2a746682c29504311cce5c457e0a852c3daf Reviewed-on: https://code.wireshark.org/review/29224 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-21 14:18:56 +00:00
configure_file(${CMAKE_SOURCE_DIR}/ws_version.h.in ${CMAKE_BINARY_DIR}/ws_version.h)
Generate better pkg-config file Firstly, when building with autogen.sh and configure script, the wireshark.pc is not generated at all. Then, due to not matching names some variables are not being replaced as they should be. Bug: 11069 Change-Id: Iefa7a9b536f3fee7f9ad78803aaacc5bb64a9c8d Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-on: https://code.wireshark.org/review/13005 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-26 16:13:00 +00:00
set( prefix "${CMAKE_INSTALL_PREFIX}" )
set( exec_prefix "\${prefix}" )
set( libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}" )
set( includedir "\${prefix}/include" )
CMake: Make plugin installation path use PLUGIN_INSTALL_LIBDIR Change-Id: I47f248f6ef56aba400054fa3ade2bf4d29eeb895 Reviewed-on: https://code.wireshark.org/review/23411 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-06 10:55:40 +00:00
set( plugindir "\${libdir}/wireshark/${PLUGIN_VERSION_DIR}" )
Generate better pkg-config file Firstly, when building with autogen.sh and configure script, the wireshark.pc is not generated at all. Then, due to not matching names some variables are not being replaced as they should be. Bug: 11069 Change-Id: Iefa7a9b536f3fee7f9ad78803aaacc5bb64a9c8d Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-on: https://code.wireshark.org/review/13005 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-12-26 16:13:00 +00:00
Switch the Doxygen API reference build to CMake. Switch to a single Doyxgen configuration which was generated using a recent version of Doxygen and customized to suit our needs. Add wsar_html and wsar_html_zip targets to CMake. Update some Doxygen markup and documentation as needed. Change-Id: Ic8a424b292c35a26f74ae0b53322265683e56e69 Reviewed-on: https://code.wireshark.org/review/26976 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16 21:49:55 +00:00
# Doxygen variables
file(GLOB TOP_LEVEL_SOURCE_LIST *.c *.cpp *.h)
string (REPLACE ";" " " DOXYGEN_TOP_LEVEL_SOURCES "${TOP_LEVEL_SOURCE_LIST}")
set(DOXYGEN_INPUT_DIRECTORY ${CMAKE_SOURCE_DIR})
set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
Windows: Make our program details more consistent. Use a single template file for most of our program resources. Encode our resource files as UTF-8. Add resources to extcap/*.exe. Replace a regex with concatenation. Change-Id: I0ed49086618127ca4fdef69272f849d8f16e4dab Reviewed-on: https://code.wireshark.org/review/30088 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-08 23:34:39 +00:00
set(CFG_OUT_FILES
doxygen.cfg
packaging/macosx/osx-app.sh
macOS: Sign our .dmg. Add osx-dmg.sh back and make it a simple wrapper around dmgbuild and codesign. Change-Id: I0baa21fd971aa1b06e1a6700881cd7625dffff35 Reviewed-on: https://code.wireshark.org/review/34629 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-09-26 17:43:13 +00:00
packaging/macosx/osx-dmg.sh
Packaging: Ship macOS dSYMs in their own .dmg. Create a Wireshark.dSYM bundle for our debugging symbols. Create a separate .dmg for the dSYM bundle, similar to what we do for Windows. `dwarfdump --uuid run/Wireshark.dSYM` returns what app This reduces the size of the application bundle and .dmg quite a bit (sizes measured with `du -sm`): 51 Wireshark 3.7.0 Intel 64.dmg 81 Wireshark dSYM 3.7.0 Intel 64.dmg 182 Wireshark.app 262 Wireshark.dSYM
2022-02-26 23:14:36 +00:00
packaging/macosx/wireshark-app.dmgbuild
packaging/macosx/wireshark-dsym.dmgbuild
More Logshark to Logwolf renaming.
2022-02-21 00:19:22 +00:00
packaging/macosx/WiresharkInfo.plist
tarball+RPM: Fetch our version from CMake. Move git-export-release.sh to packaging/source. Have the source and RPM packaging derive version information from CMake's VERSION variable. This brings them in line with the rest of our packaging and avoids having to read chicken entrails^W^Wgit output. Make sure we always generate wireshark.spec. Bug: 15359 Change-Id: I188efda489c94449a10a612abebf9c2872c305cb Reviewed-on: https://code.wireshark.org/review/31504 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-11 22:34:03 +00:00
packaging/source/git-export-release.sh
Rename the "image" directory to "resources". The "image" directory contains resource compiler assets and other application resources, so name it "resources."
2022-03-06 22:16:36 +00:00
resources/dumpcap.rc
resources/libwireshark.rc
resources/libwiretap.rc
resources/libwsutil.rc
resources/wireshark.exe.manifest
resources/wireshark.rc
Windows: Make our program details more consistent. Use a single template file for most of our program resources. Encode our resource files as UTF-8. Add resources to extcap/*.exe. Replace a regex with concatenation. Change-Id: I0ed49086618127ca4fdef69272f849d8f16e4dab Reviewed-on: https://code.wireshark.org/review/30088 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-08 23:34:39 +00:00
wireshark.pc
Process all .in files, not only the ones needed for Unix'ish systems. Change-Id: I265367f07253be4379efbb6689ec944f04ef6134 Reviewed-on: https://code.wireshark.org/review/2500 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-20 22:38:07 +00:00
)
CMake+Packaging: Add a logwolf_dmg target.
2022-06-08 01:38:46 +00:00
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
if(BUILD_logray)
CMake+Packaging: Add a logwolf_dmg target.
2022-06-08 01:38:46 +00:00
list(APPEND CFG_OUT_FILES
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
packaging/macosx/LograyInfo.plist
packaging/macosx/logray-app.dmgbuild
packaging/macosx/logray-dsym.dmgbuild
resources/logray.exe.manifest
CMake+Packaging: Add a logwolf_dmg target.
2022-06-08 01:38:46 +00:00
)
endif()
Windows: Make our program details more consistent. Use a single template file for most of our program resources. Encode our resource files as UTF-8. Add resources to extcap/*.exe. Replace a regex with concatenation. Change-Id: I0ed49086618127ca4fdef69272f849d8f16e4dab Reviewed-on: https://code.wireshark.org/review/30088 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-08 23:34:39 +00:00
foreach( _cfg_file ${CFG_OUT_FILES} )
configure_file( ${CMAKE_SOURCE_DIR}/${_cfg_file}.in ${CMAKE_BINARY_DIR}/${_cfg_file} @ONLY )
Process all .in files, not only the ones needed for Unix'ish systems. Change-Id: I265367f07253be4379efbb6689ec944f04ef6134 Reviewed-on: https://code.wireshark.org/review/2500 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-20 22:38:07 +00:00
endforeach()
Slightly rework the detection code for some packages. Make compile flag detection work (needed some not so nice hacks). svn path=/trunk/; revision=30129
2009-09-24 20:42:08 +00:00
include(FeatureSummary)
cmake: add libcap package properties. Change-Id: Ie3ea8a51d6cf200b3815b0046255bf0208240287 Reviewed-on: https://code.wireshark.org/review/35954 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2020-01-26 14:46:58 +00:00
set_package_properties(CAP PROPERTIES
DESCRIPTION "The Libcap package implements the user-space interfaces to the POSIX 1003.1e capabilities available in Linux kernels"
URL "https://sites.google.com/site/fullycapable/"
PURPOSE "Allow packet captures without running as root"
)
cmake: fix SET_FEATURE_INFO deprecation warning Fix deprecation warnings that occur with cmake 3.8, replacing it by some other function that is supported since at least cmake 2.8.8. This also updates URLs and splits the description in a package description and the purpose for the package (shown on the next line). Change-Id: Ic0f37898593f48b8f37f6a228dae49288f20538f Reviewed-on: https://code.wireshark.org/review/22393 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-25 22:34:41 +00:00
set_package_properties(SBC PROPERTIES
DESCRIPTION "Bluetooth low-complexity, subband codec (SBC) decoder"
URL "https://git.kernel.org/pub/scm/bluetooth/sbc.git"
PURPOSE "Support for playing SBC codec in RTP player"
)
set_package_properties(SPANDSP PROPERTIES
DESCRIPTION "a library of many DSP functions for telephony"
HTTPS In More Places, update some URLs. Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8 Reviewed-on: https://code.wireshark.org/review/34096 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-27 07:54:44 +00:00
URL "https://www.soft-switch.org"
cmake: fix SET_FEATURE_INFO deprecation warning Fix deprecation warnings that occur with cmake 3.8, replacing it by some other function that is supported since at least cmake 2.8.8. This also updates URLs and splits the description in a package description and the purpose for the package (shown on the next line). Change-Id: Ic0f37898593f48b8f37f6a228dae49288f20538f Reviewed-on: https://code.wireshark.org/review/22393 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-25 22:34:41 +00:00
PURPOSE "Support for G.722 and G.726 codecs in RTP player"
)
Add G.729 decoding based on bcg729 library Bug: 13635 Change-Id: Ic22a0719a59da13e51425aeb747e88caca0d6512 Reviewed-on: https://code.wireshark.org/review/22808 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-26 21:23:12 +00:00
set_package_properties(BCG729 PROPERTIES
DESCRIPTION "G.729 decoder"
BCG729: Fix url Apparently the website was reworked and the link has to be changed
2021-04-26 06:41:17 +00:00
URL "https://www.linphone.org/technical-corner/bcg729"
Add G.729 decoding based on bcg729 library Bug: 13635 Change-Id: Ic22a0719a59da13e51425aeb747e88caca0d6512 Reviewed-on: https://code.wireshark.org/review/22808 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-26 21:23:12 +00:00
PURPOSE "Support for G.729 codec in RTP player"
)
RTP: decode iLBC payload It is possible to decode iLBC payload. It uses libilbc library (https://github.com/TimothyGu/libilbc). Bug: 16314 Change-Id: Id4cad7ae32305a0e94ef32beb24e07733d7f834e Reviewed-on: https://code.wireshark.org/review/35686 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-18 22:55:25 +00:00
set_package_properties(ILBC PROPERTIES
DESCRIPTION "iLBC decoder"
URL "https://github.com/TimothyGu/libilbc"
PURPOSE "Support for iLBC codec in RTP player"
)
RTP: opus playback It's possible to play opus payload with libopus (https://opus-codec.org/). Closes #16882. Helped-by: Pascal Quantin <pascal.quantin@gmail.com> Signed-off-by: Lin Sun <lin.sun@zoom.us> Signed-off-by: Yuanzhi Li <ryanlee@mail.ustc.edu.cn>
2020-09-29 04:33:06 +00:00
set_package_properties(OPUS PROPERTIES
DESCRIPTION "opus decoder"
URL "https://opus-codec.org/"
PURPOSE "Support for opus codec in RTP player"
)
cmake: fix SET_FEATURE_INFO deprecation warning Fix deprecation warnings that occur with cmake 3.8, replacing it by some other function that is supported since at least cmake 2.8.8. This also updates URLs and splits the description in a package description and the purpose for the package (shown on the next line). Change-Id: Ic0f37898593f48b8f37f6a228dae49288f20538f Reviewed-on: https://code.wireshark.org/review/22393 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-25 22:34:41 +00:00
set_package_properties(LIBXML2 PROPERTIES
DESCRIPTION "XML parsing library"
URL "http://xmlsoft.org/"
PURPOSE "Read XML configuration files in EPL dissector"
)
set_package_properties(LIBSSH PROPERTIES
DESCRIPTION "Library for implementing SSH clients"
URL "https://www.libssh.org/"
extcap: new interface, wifidump, to capture Wi-Fi frames using a remote SSH host
2022-03-08 21:38:13 +00:00
PURPOSE "extcap remote SSH interfaces (sshdump, ciscodump, wifidump)"
cmake: fix SET_FEATURE_INFO deprecation warning Fix deprecation warnings that occur with cmake 3.8, replacing it by some other function that is supported since at least cmake 2.8.8. This also updates URLs and splits the description in a package description and the purpose for the package (shown on the next line). Change-Id: Ic0f37898593f48b8f37f6a228dae49288f20538f Reviewed-on: https://code.wireshark.org/review/22393 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-25 22:34:41 +00:00
)
set_package_properties(LZ4 PROPERTIES
wiretap: Add zstd and lz4 as WTAP compression types This has a few effects on the behavior of wtap_get_compression_type() and wtap_get_all_compression_type_extensions(): Make capinfos correctly report the compression type (instead of saying gzip compressed for zstd and lz4 compressed files). Makes files with the .zstd and .lz4 extension show up in the file chooser when "Files of type" is set to something other than "All Files", such as "All Capture Files" or "Wireshark/... pcapng" Makes the UI not default to gzip compression when saving a file compressed as zstd or lz4 (write support for zstd and lz4 doesn't exist yet, and the GUI doesn't have hooks for it anyway, though this can help as a prerequisite for later support for writing.) Also replace a couple of assert() with ws_assert(). Update the PURPOSE in CMakeLists for zstd and lz4 to note that they can be used to read compressed capture files.
2021-09-11 00:46:54 +00:00
DESCRIPTION "LZ4 is a fast lossless compression algorithm"
cmake: fix SET_FEATURE_INFO deprecation warning Fix deprecation warnings that occur with cmake 3.8, replacing it by some other function that is supported since at least cmake 2.8.8. This also updates URLs and splits the description in a package description and the purpose for the package (shown on the next line). Change-Id: Ic0f37898593f48b8f37f6a228dae49288f20538f Reviewed-on: https://code.wireshark.org/review/22393 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-25 22:34:41 +00:00
URL "http://www.lz4.org"
wiretap: Add zstd and lz4 as WTAP compression types This has a few effects on the behavior of wtap_get_compression_type() and wtap_get_all_compression_type_extensions(): Make capinfos correctly report the compression type (instead of saying gzip compressed for zstd and lz4 compressed files). Makes files with the .zstd and .lz4 extension show up in the file chooser when "Files of type" is set to something other than "All Files", such as "All Capture Files" or "Wireshark/... pcapng" Makes the UI not default to gzip compression when saving a file compressed as zstd or lz4 (write support for zstd and lz4 doesn't exist yet, and the GUI doesn't have hooks for it anyway, though this can help as a prerequisite for later support for writing.) Also replace a couple of assert() with ws_assert(). Update the PURPOSE in CMakeLists for zstd and lz4 to note that they can be used to read compressed capture files.
2021-09-11 00:46:54 +00:00
PURPOSE "LZ4 decompression in CQL and Kafka dissectors, read compressed capture files"
cmake: fix SET_FEATURE_INFO deprecation warning Fix deprecation warnings that occur with cmake 3.8, replacing it by some other function that is supported since at least cmake 2.8.8. This also updates URLs and splits the description in a package description and the purpose for the package (shown on the next line). Change-Id: Ic0f37898593f48b8f37f6a228dae49288f20538f Reviewed-on: https://code.wireshark.org/review/22393 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-25 22:34:41 +00:00
)
set_package_properties(SNAPPY PROPERTIES
DESCRIPTION "A fast compressor/decompressor from Google"
HTTPS In More Places, update some URLs. Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8 Reviewed-on: https://code.wireshark.org/review/34096 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-27 07:54:44 +00:00
URL "https://google.github.io/snappy/"
cmake: fix SET_FEATURE_INFO deprecation warning Fix deprecation warnings that occur with cmake 3.8, replacing it by some other function that is supported since at least cmake 2.8.8. This also updates URLs and splits the description in a package description and the purpose for the package (shown on the next line). Change-Id: Ic0f37898593f48b8f37f6a228dae49288f20538f Reviewed-on: https://code.wireshark.org/review/22393 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-25 22:34:41 +00:00
PURPOSE "Snappy decompression in CQL and Kafka dissectors"
)
Kafka: include zstd compression in Kafka message batches Change-Id: I1d06486ccf7b174ee9aa621fa3d8acb8b3673777 Reviewed-on: https://code.wireshark.org/review/34222 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-12 21:57:45 +00:00
set_package_properties(ZSTD PROPERTIES
DESCRIPTION "A compressor/decompressor from Facebook providing better compression than Snappy at a cost of speed"
URL "https://facebook.github.io/zstd/"
wiretap: Add zstd and lz4 as WTAP compression types This has a few effects on the behavior of wtap_get_compression_type() and wtap_get_all_compression_type_extensions(): Make capinfos correctly report the compression type (instead of saying gzip compressed for zstd and lz4 compressed files). Makes files with the .zstd and .lz4 extension show up in the file chooser when "Files of type" is set to something other than "All Files", such as "All Capture Files" or "Wireshark/... pcapng" Makes the UI not default to gzip compression when saving a file compressed as zstd or lz4 (write support for zstd and lz4 doesn't exist yet, and the GUI doesn't have hooks for it anyway, though this can help as a prerequisite for later support for writing.) Also replace a couple of assert() with ws_assert(). Update the PURPOSE in CMakeLists for zstd and lz4 to note that they can be used to read compressed capture files.
2021-09-11 00:46:54 +00:00
PURPOSE "Zstd decompression in Kafka dissector, read compressed capture files"
Kafka: include zstd compression in Kafka message batches Change-Id: I1d06486ccf7b174ee9aa621fa3d8acb8b3673777 Reviewed-on: https://code.wireshark.org/review/34222 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-12 21:57:45 +00:00
)
cmake: fix SET_FEATURE_INFO deprecation warning Fix deprecation warnings that occur with cmake 3.8, replacing it by some other function that is supported since at least cmake 2.8.8. This also updates URLs and splits the description in a package description and the purpose for the package (shown on the next line). Change-Id: Ic0f37898593f48b8f37f6a228dae49288f20538f Reviewed-on: https://code.wireshark.org/review/22393 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-25 22:34:41 +00:00
set_package_properties(NGHTTP2 PROPERTIES
DESCRIPTION "HTTP/2 C library and tools"
URL "https://nghttp2.org"
PURPOSE "Header decompression in HTTP2"
)
CMake: Minor standard output improvements Change-Id: I7677220ec49d7b04f61e2a7287dac3a744f1c6c6 Reviewed-on: https://code.wireshark.org/review/31786 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-01-28 20:02:34 +00:00
set_package_properties(CARES PROPERTIES
DESCRIPTION "Library for asynchronous DNS requests"
c-ares: move domain from haxx.se to its own .org With c-ares release 1.18.0 the URLs were updated to c-ares.org. Let's do the same.
2021-11-16 09:10:54 +00:00
URL "https://c-ares.org/"
CMake: Minor standard output improvements Change-Id: I7677220ec49d7b04f61e2a7287dac3a744f1c6c6 Reviewed-on: https://code.wireshark.org/review/31786 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-01-28 20:02:34 +00:00
PURPOSE "DNS name resolution for captures"
)
CMake: rewrite FindSystemd.cmake file Clarify that this is only needed for the sdjournal extcap interface and report the found version in the CMake output. Change-Id: I40bc540631bda32d0b92e4fcd59d8c1726606d86 Reviewed-on: https://code.wireshark.org/review/31834 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-31 10:34:47 +00:00
set_package_properties(Systemd PROPERTIES
URL "https://freedesktop.org/wiki/Software/systemd/"
DESCRIPTION "System and Service Manager (libraries)"
PURPOSE "Support for systemd journal extcap interface (sdjournal)"
)
CMake: describe the purpose of NL Change-Id: I9bfb2400445399088ff67eab39178e38daf85499 Reviewed-on: https://code.wireshark.org/review/31835 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-31 10:43:04 +00:00
set_package_properties(NL PROPERTIES
URL "https://www.infradead.org/~tgr/libnl/"
DESCRIPTION "Libraries for using the Netlink protocol on Linux"
PURPOSE "Support for managing wireless 802.11 interfaces"
)
CMake: describe purpose of MaxMindDB Change-Id: I7a3ec64d772ee5fc0d3b040702dfc0de8da93250 Reviewed-on: https://code.wireshark.org/review/31836 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-31 10:47:26 +00:00
set_package_properties(MaxMindDB PROPERTIES
URL "https://github.com/maxmind/libmaxminddb"
DESCRIPTION "C library for the MaxMind DB file format"
PURPOSE "Support for GeoIP lookup"
)
CMake: Check for and use system SpeexDSP library Change-Id: I8443379d23a2946dd21c12e5e0bd5464ab73ca25 Reviewed-on: https://code.wireshark.org/review/31857 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-02-02 14:52:07 +00:00
set_package_properties(SpeexDSP PROPERTIES
URL "https://www.speex.org/"
DESCRIPTION "SpeexDSP is a patent-free, Open Source/Free Software DSP library"
PURPOSE "RTP audio resampling"
)
Qt: Import Profile information Allow easy import of profiles. Profiles must be stored inside a zip file, with no additional hierarchy. Change-Id: I0ae77460c20ef6b3e447906e671b0cefa6b9b032 Reviewed-on: https://code.wireshark.org/review/33881 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2019-07-10 22:25:45 +00:00
set_package_properties(Minizip PROPERTIES
CMake: The minizip URL is ancient Use something a bit more modern instead.
2021-09-23 11:51:03 +00:00
URL "https://github.com/madler/zlib"
DESCRIPTION "Mini zip and unzip based on zlib"
Qt: Import Profile information Allow easy import of profiles. Profiles must be stored inside a zip file, with no additional hierarchy. Change-Id: I0ae77460c20ef6b3e447906e671b0cefa6b9b032 Reviewed-on: https://code.wireshark.org/review/33881 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2019-07-10 22:25:45 +00:00
PURPOSE "Support for profiles import/export"
)
epan: Add SMI version
2021-05-25 17:12:29 +00:00
set_package_properties(SMI PROPERTIES
URL "https://www.ibr.cs.tu-bs.de/projects/libsmi/"
DESCRIPTION "Library to access SMI management information"
PURPOSE "Support MIB and PIB parsing and OID resolution"
)
dfilter: Add support for PCRE2 PCRE2 is the future of PCRE. The only advantage of GRegex is that it comes bundled with GLib, which is not an advantage at all. PCRE2 is widely available, the GRegex abstractions layer are not a good fit and abstract things that don't need abstracting or that we could handle better ourselves, there are open bugs (#12997) and maintenance is spotty at best. GRegex comes with many of the problems of bundled code, aggravated by the fact that it completely falls outside of our control.
2021-10-15 17:34:33 +00:00
set_package_properties(PCRE2 PROPERTIES
URL "https://www.pcre.org"
DESCRIPTION "Regular expression pattern matching using the same syntax and semantics as Perl 5"
PURPOSE "Support for regular expressions"
)
Rename Sysdig Bridge to Falco Bridge. The Sysdig Bridge plugin loads Falco plugins, so rename it to Falco Bridge. Make it optional and dependent on libsinsp+libscap, similar to our codec plugins. Remove some unused code.
2022-03-10 20:21:12 +00:00
set_package_properties(Sinsp PROPERTIES
DESCRIPTION "libsinsp and libscap"
URL "https://github.com/falcosecurity/libs/"
PURPOSE "Support for Falco plugins"
)
CMake: Print build flags just before feature summary Change-Id: I79cc1df1eb04c5ed9bed722f07fdea7db2adcede Reviewed-on: https://code.wireshark.org/review/23674 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-24 08:19:54 +00:00
CMake: Minor standard output improvements Change-Id: I7677220ec49d7b04f61e2a7287dac3a744f1c6c6 Reviewed-on: https://code.wireshark.org/review/31786 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-01-28 20:02:34 +00:00
string(TOUPPER "${CMAKE_BUILD_TYPE}" _build_type)
message(STATUS "C-Flags: ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${_build_type}}")
message(STATUS "CXX-Flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${_build_type}}")
if(WERROR_COMMON_FLAGS)
message(STATUS "Warnings as errors enabled: ${WERROR_COMMON_FLAGS}")
else()
message(STATUS "Warnings as errors disabled")
endif()
CMake: Print build flags just before feature summary Change-Id: I79cc1df1eb04c5ed9bed722f07fdea7db2adcede Reviewed-on: https://code.wireshark.org/review/23674 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-24 08:19:54 +00:00
cmake: fix SET_FEATURE_INFO deprecation warning Fix deprecation warnings that occur with cmake 3.8, replacing it by some other function that is supported since at least cmake 2.8.8. This also updates URLs and splits the description in a package description and the purpose for the package (shown on the next line). Change-Id: Ic0f37898593f48b8f37f6a228dae49288f20538f Reviewed-on: https://code.wireshark.org/review/22393 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-25 22:34:41 +00:00
feature_summary(WHAT ALL)
Slightly rework the detection code for some packages. Make compile flag detection work (needed some not so nice hacks). svn path=/trunk/; revision=30129
2009-09-24 20:42:08 +00:00
macOS: Add support for automatic updates using Sparkle. Add support for automatic updates using the Sparkle framework. Add FindSparkle.cmake and associated CMake plumbing. Add a public key and other info to Info.plist.in. Add ui/macosx/sparkle_bridge.{h,m}, which wraps the Sparkle API. Make code that's specific to WinSparkle Windows-only. Add Sparkle installation steps to the macos-setup scripts. Sparkle prints a warning if your bundle is unsigned (which is the case during development) so disable installing it by default. Updating here takes a long time. We might be able to fix that by shipping our DSYMs separately. Change-Id: I6cc6671db5657dadc514bda6bf6e1c8bbc9468a5 Reviewed-on: https://code.wireshark.org/review/35090 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-14 16:08:28 +00:00
# Should this be part of libui?
Add WIN32 platform sources svn path=/trunk/; revision=29621
2009-08-30 06:24:44 +00:00
if(WIN32)
Now the GUI programs (wireshark/gtk2 and qtshark) compile and link svn path=/trunk/; revision=52538
2013-10-11 10:32:11 +00:00
set(PLATFORM_UI_SRC
Win32: Compile ui/win32 as C++. We always build the .c files in ui/win32 with Visual C++, so rename them to .cpp and update CMakeLists.txt to match. Leave the C code mostly intact for now, but this lets us take advantage of C++ features in the future if desired.
2021-07-01 17:06:02 +00:00
ui/win32/console_win32.cpp
ui/win32/file_dlg_win32.cpp
Don't run checkapi on .rc files. Change-Id: I75879bfcd0d9706523447146b16c319d3eb56d23 Reviewed-on: https://code.wireshark.org/review/6361 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-07 10:17:14 +00:00
)
set(PLATFORM_UI_RC_FILES
Rename the "image" directory to "resources". The "image" directory contains resource compiler assets and other application resources, so name it "resources."
2022-03-06 22:16:36 +00:00
resources/file_dlg_win32.rc
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
)
Qt: Fix MacOSX menu entries Remove various menu items added automatically on Mac OS X. The following menu items have been removed: - Edit / Start Dictation - Edit / Emoji & Symbols - View / Enter Fullscreen Mode - View / Show Tab Bar - Hide Tab Bar Bug: 13366 Change-Id: I44deae7ee8ea7a43926820e4f5d0517ece246939 Reviewed-on: https://code.wireshark.org/review/26823 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-09 09:39:49 +00:00
elseif(APPLE)
set(PLATFORM_UI_SRC
ui/macosx/cocoa_bridge.mm
)
macOS: Add support for automatic updates using Sparkle. Add support for automatic updates using the Sparkle framework. Add FindSparkle.cmake and associated CMake plumbing. Add a public key and other info to Info.plist.in. Add ui/macosx/sparkle_bridge.{h,m}, which wraps the Sparkle API. Make code that's specific to WinSparkle Windows-only. Add Sparkle installation steps to the macos-setup scripts. Sparkle prints a warning if your bundle is unsigned (which is the case during development) so disable installing it by default. Updating here takes a long time. We might be able to fix that by shipping our DSYMs separately. Change-Id: I6cc6671db5657dadc514bda6bf6e1c8bbc9468a5 Reviewed-on: https://code.wireshark.org/review/35090 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-14 16:08:28 +00:00
if (SPARKLE_FOUND)
list(APPEND PLATFORM_UI_SRC ui/macosx/sparkle_bridge.m)
endif()
Add WIN32 platform sources svn path=/trunk/; revision=29621
2009-08-30 06:24:44 +00:00
endif()
OK, so my last commit message was too optimistic - I was using an installed version of wsutil. dumpcap now really builds on Linux via cmake. svn path=/trunk/; revision=28754
2009-06-16 04:12:30 +00:00
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
set(TSHARK_TAP_SRC
tap: add credentials tap. This new tap collects credentials (username and paassword) from the dissectors. So far, few dissectors have been instrumented: - http (basic auth) - http (header auth) - ftp Others can be instrumented as well using the same technique. Tshark has a new option (-z credentials) and Wireshark a new "tools" menu: the documentation has been updated accordingly. Change-Id: I2d0d96598c85bb3ea4fb5ec090dd8dc28b481fc9 Reviewed-on: https://code.wireshark.org/review/33453 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-05-29 14:06:38 +00:00
${CMAKE_SOURCE_DIR}/ui/cli/tap-credentials.c
Rewrite make-tap-reg.py in C Change-Id: Ief5b1fffecc9712c01ff10292c403b7c84a5908a Reviewed-on: https://code.wireshark.org/review/24756 Reviewed-by: João Valverde <j@v6e.pt>
2017-12-10 17:29:40 +00:00
${CMAKE_SOURCE_DIR}/ui/cli/tap-camelsrt.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-diameter-avp.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-expert.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-exportobject.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-endpoints.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-flow.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-follow.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-funnel.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-gsm_astat.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-hosts.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-httpstat.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-icmpstat.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-icmpv6stat.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-iostat.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-iousers.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-macltestat.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-protocolinfo.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-protohierstat.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-rlcltestat.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-rpcprogs.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-rtd.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-rtp.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-rtspstat.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-sctpchunkstat.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-simple_stattable.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-sipstat.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-smbsids.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-srt.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-stats_tree.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-sv.c
${CMAKE_SOURCE_DIR}/ui/cli/tap-wspstat.c
CMake: Add abillity to add custom taps. Change-Id: I2b6382a3a97117bc40b5433123401c19b31cda82 Reviewed-on: https://code.wireshark.org/review/34802 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-10-18 07:32:25 +00:00
${CUSTOM_TSHARK_TAP_SRC}
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
)
Move some configuration and data files to resources/share. Create resources/share/wireshark and resources/share/logwolf. Move various data and configuration files to resources/share/wireshark and add resources/share/logwolf/colorfilters.
2022-04-25 16:04:55 +00:00
# Installed into ${DATAFILE_DIR}
CMake: - Add opcua to the list of plugins to build - Link the gtk stuff statically into wireshark - Beginnings of "make install" - Change a few things about install paths svn path=/trunk/; revision=30029
2009-09-21 00:19:07 +00:00
set(INSTALL_DIRS
Move some configuration and data files to resources/share. Create resources/share/wireshark and resources/share/logwolf. Move various data and configuration files to resources/share/wireshark and add resources/share/logwolf/colorfilters.
2022-04-25 16:04:55 +00:00
resources/share/wireshark/profiles
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
resources/protocols/diameter
resources/protocols/dtds
resources/protocols/radius
resources/protocols/tpncp
resources/protocols/wimaxasncp
CMake: - Add opcua to the list of plugins to build - Link the gtk stuff statically into wireshark - Beginnings of "make install" - Change a few things about install paths svn path=/trunk/; revision=30029
2009-09-21 00:19:07 +00:00
)
Move some configuration and data files to resources/share. Create resources/share/wireshark and resources/share/logwolf. Move various data and configuration files to resources/share/wireshark and add resources/share/logwolf/colorfilters.
2022-04-25 16:04:55 +00:00
# Installed into ${DATAFILE_DIR}
CMake: - Add opcua to the list of plugins to build - Link the gtk stuff statically into wireshark - Beginnings of "make install" - Change a few things about install paths svn path=/trunk/; revision=30029
2009-09-21 00:19:07 +00:00
set(INSTALL_FILES
Move some configuration and data files to resources/share. Create resources/share/wireshark and resources/share/logwolf. Move various data and configuration files to resources/share/wireshark and add resources/share/logwolf/colorfilters.
2022-04-25 16:04:55 +00:00
docbook/ws.css
Rename enterprises to enterprises.tsv and ship it. Rename "enterprises" to "enterprises.tsv" so that its format is a bit more obvious and so that double-clicking the file might do something useful. Add it to the Windows packages. Change-Id: I5ef54a04ce1b4926aa4535e756e04b3e2a56d463 Reviewed-on: https://code.wireshark.org/review/22616 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-13 20:03:13 +00:00
enterprises.tsv
- Previous patch moved the intall targes dirs too far down. - Install some auxiliary files (AUTHORS-SHORT, manuf, ...) svn path=/trunk/; revision=30135
2009-09-25 02:50:48 +00:00
manuf
Move some configuration and data files to resources/share. Create resources/share/wireshark and resources/share/logwolf. Move various data and configuration files to resources/share/wireshark and add resources/share/logwolf/colorfilters.
2022-04-25 16:04:55 +00:00
resources/share/wireshark/cfilters
resources/share/wireshark/colorfilters
resources/share/wireshark/dfilter_macros
resources/share/wireshark/dfilters
resources/share/wireshark/ipmap.html
resources/share/wireshark/pdml2html.xsl
resources/share/wireshark/smi_modules
- Previous patch moved the intall targes dirs too far down. - Install some auxiliary files (AUTHORS-SHORT, manuf, ...) svn path=/trunk/; revision=30135
2009-09-25 02:50:48 +00:00
services
Put the well-known addresses into a separate file from OUIs Having two distinct logical concepts (OUI and Well Known Address) concatenated to a single "manuf" file is needlessly obfuscating the WKA feature. Have a distinct "wka" file instead and just skip the cat. Change-Id: I46f53b0015a37331d65f8cfac7cbbd499dd0c5b8 Reviewed-on: https://code.wireshark.org/review/22742 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-20 01:32:40 +00:00
wka
CMake: - Add opcua to the list of plugins to build - Link the gtk stuff statically into wireshark - Beginnings of "make install" - Change a few things about install paths svn path=/trunk/; revision=30029
2009-09-21 00:19:07 +00:00
)
Add a default configuration profile for Logray. Add and install default coloring rules and filter buttons for Logray. Add is_packet_configuration_namespace() and use it to set the default timestamp type for Logray to "Absolute", which is more appropriate for log entries.
2022-06-17 22:22:26 +00:00
if (BUILD_logray)
set(LOG_INSTALL_FILES
resources/share/logray/colorfilters
resources/share/logray/dfilter_buttons
)
endif()
Docs+Packaging: Convert our man pages to Asciidoctor. Convert doc/*.pod to Asciidoctor. This: * Means we use the same markup for our man pages, the guides, and release notes. * Lets us add versions to our man pages. * Gives us more formatting options, e.g. AsciiDoc supports `commands`, nested lists and makes it easy to include version information. The manpage backend doesn't seem to support tables very well, unfortunately. Convert our CMake configuration to produce *roff and html man pages using Asciidoctor. Add a "manarg" block macro which makes our synopses wrap correctly. Similar to the release notes, guides, and FAQ, if Asciidoctor isn't found the man pages won't be generated or installed. Move Asciidoctor to the list of package build dependencies in various places. This commit includes the conversion script (pod2adoc.py), which will be removed later. Line count sanity check: Man page .pod .adoc androiddump 260 280 asn2deb 93 105 capinfos 401 471 captype 54 55 ciscodump 241 269 dftest 42 42 dpauxmon 153 169 dumpcap 464 534 editcap 528 583 etwdump 136 156 extcap 157 181 idl2deb 91 103 idl2wrs 120 100 mergecap 206 207 mmdbresolve 75 75 randpkt 107 111 randpktdump 158 184 rawshark 558 610 reordercap 76 78 sdjournal 145 157 sshdump 272 302 text2pcap 274 312 tshark 2135 2360 udpdump 133 151 wireshark-filter 486 479 wireshark 2967 3420
2021-06-18 10:20:51 +00:00
if (ASCIIDOCTOR_FOUND)
Revert "CMake: Don't install HTML manuals twice" This reverts commit f1285fcf061669702ca1accd7b2c50ebc8198993. NSIS package is broken with this commit. Change-Id: Ief22a308edad188fa2d5fab79355f19493359fa6 Reviewed-on: https://code.wireshark.org/review/34758 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-10-10 15:34:46 +00:00
list(APPEND INSTALL_FILES
Docs+Packaging: Convert our man pages to Asciidoctor. Convert doc/*.pod to Asciidoctor. This: * Means we use the same markup for our man pages, the guides, and release notes. * Lets us add versions to our man pages. * Gives us more formatting options, e.g. AsciiDoc supports `commands`, nested lists and makes it easy to include version information. The manpage backend doesn't seem to support tables very well, unfortunately. Convert our CMake configuration to produce *roff and html man pages using Asciidoctor. Add a "manarg" block macro which makes our synopses wrap correctly. Similar to the release notes, guides, and FAQ, if Asciidoctor isn't found the man pages won't be generated or installed. Move Asciidoctor to the list of package build dependencies in various places. This commit includes the conversion script (pod2adoc.py), which will be removed later. Line count sanity check: Man page .pod .adoc androiddump 260 280 asn2deb 93 105 capinfos 401 471 captype 54 55 ciscodump 241 269 dftest 42 42 dpauxmon 153 169 dumpcap 464 534 editcap 528 583 etwdump 136 156 extcap 157 181 idl2deb 91 103 idl2wrs 120 100 mergecap 206 207 mmdbresolve 75 75 randpkt 107 111 randpktdump 158 184 rawshark 558 610 reordercap 76 78 sdjournal 145 157 sshdump 272 302 text2pcap 274 312 tshark 2135 2360 udpdump 133 151 wireshark-filter 486 479 wireshark 2967 3420
2021-06-18 10:20:51 +00:00
${CMAKE_BINARY_DIR}/doc/AUTHORS-SHORT
${CMAKE_BINARY_DIR}/doc/androiddump.html
${CMAKE_BINARY_DIR}/doc/udpdump.html
${CMAKE_BINARY_DIR}/doc/capinfos.html
${CMAKE_BINARY_DIR}/doc/captype.html
${CMAKE_BINARY_DIR}/doc/ciscodump.html
${CMAKE_BINARY_DIR}/doc/dftest.html
${CMAKE_BINARY_DIR}/doc/dumpcap.html
${CMAKE_BINARY_DIR}/doc/editcap.html
${CMAKE_BINARY_DIR}/doc/extcap.html
${CMAKE_BINARY_DIR}/doc/mergecap.html
${CMAKE_BINARY_DIR}/doc/randpkt.html
${CMAKE_BINARY_DIR}/doc/randpktdump.html
${CMAKE_BINARY_DIR}/doc/etwdump.html
${CMAKE_BINARY_DIR}/doc/rawshark.html
${CMAKE_BINARY_DIR}/doc/reordercap.html
${CMAKE_BINARY_DIR}/doc/sshdump.html
extcap: new interface, wifidump, to capture Wi-Fi frames using a remote SSH host
2022-03-08 21:38:13 +00:00
${CMAKE_BINARY_DIR}/doc/wifidump.html
Docs+Packaging: Convert our man pages to Asciidoctor. Convert doc/*.pod to Asciidoctor. This: * Means we use the same markup for our man pages, the guides, and release notes. * Lets us add versions to our man pages. * Gives us more formatting options, e.g. AsciiDoc supports `commands`, nested lists and makes it easy to include version information. The manpage backend doesn't seem to support tables very well, unfortunately. Convert our CMake configuration to produce *roff and html man pages using Asciidoctor. Add a "manarg" block macro which makes our synopses wrap correctly. Similar to the release notes, guides, and FAQ, if Asciidoctor isn't found the man pages won't be generated or installed. Move Asciidoctor to the list of package build dependencies in various places. This commit includes the conversion script (pod2adoc.py), which will be removed later. Line count sanity check: Man page .pod .adoc androiddump 260 280 asn2deb 93 105 capinfos 401 471 captype 54 55 ciscodump 241 269 dftest 42 42 dpauxmon 153 169 dumpcap 464 534 editcap 528 583 etwdump 136 156 extcap 157 181 idl2deb 91 103 idl2wrs 120 100 mergecap 206 207 mmdbresolve 75 75 randpkt 107 111 randpktdump 158 184 rawshark 558 610 reordercap 76 78 sdjournal 145 157 sshdump 272 302 text2pcap 274 312 tshark 2135 2360 udpdump 133 151 wireshark-filter 486 479 wireshark 2967 3420
2021-06-18 10:20:51 +00:00
${CMAKE_BINARY_DIR}/doc/text2pcap.html
${CMAKE_BINARY_DIR}/doc/tshark.html
${CMAKE_BINARY_DIR}/doc/wireshark.html
${CMAKE_BINARY_DIR}/doc/wireshark-filter.html
Revert "CMake: Don't install HTML manuals twice" This reverts commit f1285fcf061669702ca1accd7b2c50ebc8198993. NSIS package is broken with this commit. Change-Id: Ief22a308edad188fa2d5fab79355f19493359fa6 Reviewed-on: https://code.wireshark.org/review/34758 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-10-10 15:34:46 +00:00
)
Docs+Packaging: Convert our man pages to Asciidoctor. Convert doc/*.pod to Asciidoctor. This: * Means we use the same markup for our man pages, the guides, and release notes. * Lets us add versions to our man pages. * Gives us more formatting options, e.g. AsciiDoc supports `commands`, nested lists and makes it easy to include version information. The manpage backend doesn't seem to support tables very well, unfortunately. Convert our CMake configuration to produce *roff and html man pages using Asciidoctor. Add a "manarg" block macro which makes our synopses wrap correctly. Similar to the release notes, guides, and FAQ, if Asciidoctor isn't found the man pages won't be generated or installed. Move Asciidoctor to the list of package build dependencies in various places. This commit includes the conversion script (pod2adoc.py), which will be removed later. Line count sanity check: Man page .pod .adoc androiddump 260 280 asn2deb 93 105 capinfos 401 471 captype 54 55 ciscodump 241 269 dftest 42 42 dpauxmon 153 169 dumpcap 464 534 editcap 528 583 etwdump 136 156 extcap 157 181 idl2deb 91 103 idl2wrs 120 100 mergecap 206 207 mmdbresolve 75 75 randpkt 107 111 randpktdump 158 184 rawshark 558 610 reordercap 76 78 sdjournal 145 157 sshdump 272 302 text2pcap 274 312 tshark 2135 2360 udpdump 133 151 wireshark-filter 486 479 wireshark 2967 3420
2021-06-18 10:20:51 +00:00
if(MAXMINDDB_FOUND)
list(APPEND INSTALL_FILES ${CMAKE_BINARY_DIR}/doc/mmdbresolve.html)
endif()
if (BUILD_corbaidl2wrs)
list(APPEND INSTALL_FILES ${CMAKE_BINARY_DIR}/doc/idl2wrs.html)
endif()
if (BUILD_xxx2deb)
list(APPEND INSTALL_FILES
${CMAKE_BINARY_DIR}/doc/asn2deb.html
${CMAKE_BINARY_DIR}/doc/idl2deb.html
)
endif()
Revert "CMake: Don't install HTML manuals twice" This reverts commit f1285fcf061669702ca1accd7b2c50ebc8198993. NSIS package is broken with this commit. Change-Id: Ief22a308edad188fa2d5fab79355f19493359fa6 Reviewed-on: https://code.wireshark.org/review/34758 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-10-10 15:34:46 +00:00
endif()
Windows: Get rid of textify.ps1. We used textify.ps1 to ensure that the .txt files in our Windows installers would render properly in Notepad if the user double-clicked on them. Newer versions of Windows have a more sane Notepad, so this is no longer necessary: https://devblogs.microsoft.com/commandline/extended-eol-in-notepad/ Copy COPYING, NEWS, README.md, and README.windows once. Update README.windows. Change-Id: Ibb8b749725f13e0e49d2a2abe04603d9f2be7960 Reviewed-on: https://code.wireshark.org/review/35470 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-12-17 00:42:13 +00:00
if(NOT WIN32)
# We do this for Windows further down in the copy_data_files target.
list(APPEND INSTALL_FILES COPYING)
CMake: Copy data files to the run directory. Set DATAFILE_DIR to a value that includes the build configuration. Add a copy_data_files target that copies AUTHORS-SHORT, the default filters, and other support files to the run directory. Add FindPowerShell.cmake and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ declarations which are now covered by copy_data_files. Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 Reviewed-on: https://code.wireshark.org/review/6561 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 21:07:48 +00:00
endif()
Windows: Add preliminary support for MSYS2 If we are using MSYS2 we use those packages to build Wireshark using MinGW-w64 and disable most or all of our win-setup.ps1 codepaths. Fix GLib configuration. Disable copying of DLLs with MSYS2. Some tests in the suite_capture test suite are failing with MSYS MINGW64. That particular set of tests is way too brittle regarding file system paths; more work is needed to improve that situation.
2021-09-22 22:02:03 +00:00
if(USE_REPOSITORY)
CMake: Copy our DLLs to a DLL-specific directory. Set our DLL build directory to the the target directory for wsutil.dll instead of DATAFILE_DIR.
2022-07-05 22:44:54 +00:00
set(_dll_output_dir "$<TARGET_FILE_DIR:wsutil>")
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
add_custom_target(copy_cli_dlls)
CMake: Copy data files to the run directory. Set DATAFILE_DIR to a value that includes the build configuration. Add a copy_data_files target that copies AUTHORS-SHORT, the default filters, and other support files to the run directory. Add FindPowerShell.cmake and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ declarations which are now covered by copy_data_files. Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 Reviewed-on: https://code.wireshark.org/review/6561 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 21:07:48 +00:00
set_target_properties(copy_cli_dlls PROPERTIES FOLDER "Copy Tasks")
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
add_custom_command(TARGET copy_cli_dlls PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory "${_dll_output_dir}"
)
# XXX Can (and should) we iterate over these similar to the way
# the top-level CMakeLists.txt iterates over the package list?
Windows: Start using a `vcpkg export` bundle. Create a library bundle using `vcpkg export ... --zip` as described at https://vcpkg.readthedocs.io/en/latest/users/integration/#export-command. The bundle includes the following packages: gettext 0.19-8 glib 2.52.3-13 libffi 3.1-4 libiconv 1.15-5 liblzma 5.2.4 libxml2 2.9.9-4 pcre 8.41-1 zlib 1.2.11-5 It also includes a CMake toolchain file which we might want to make use of in the future. This means we no longer compile Zlib locally. Update the CMake environment accordingly and remove zlib from win-setup.ps1. It includes PDBs, so add them to the PDB .zip. Change-Id: I0a94904a86d836e990019dab62af506573be1f35 Reviewed-on: https://code.wireshark.org/review/31377 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-04 23:37:46 +00:00
# Required DLLs and their corresponding PDBs.
CMake: File copy updates. Switch from `xcopy`-ing single files to `cmake -E copy_if_different`-ing multiple files on Windows. Add a comment about using copy_if_different for our data files. Switch from `cmake -E copy` to `cmake -E copy_if_different` in a couple of other places. Change-Id: I6bf72f02a66c46a4440280305479f41ffb4e987a Reviewed-on: https://code.wireshark.org/review/25402 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-20 00:02:20 +00:00
add_custom_command(TARGET copy_cli_dlls PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
CMake: Use glib debug dlls in Windows debug builds This prevents the mix of debug/release Universal CRT library in a Wireshark. Bug: 16030 Change-Id: I2961541824caf3bef0a08c72b242427b5406a9bd Reviewed-on: https://code.wireshark.org/review/34444 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-09-03 18:28:52 +00:00
"$<IF:$<CONFIG:Debug>,${GLIB2_DLLS_DEBUG},${GLIB2_DLLS_RELEASE}>"
"$<IF:$<CONFIG:Debug>,${GLIB2_PDBS_DEBUG},${GLIB2_PDBS_RELEASE}>"
CMake: File copy updates. Switch from `xcopy`-ing single files to `cmake -E copy_if_different`-ing multiple files on Windows. Add a comment about using copy_if_different for our data files. Switch from `cmake -E copy` to `cmake -E copy_if_different` in a couple of other places. Change-Id: I6bf72f02a66c46a4440280305479f41ffb4e987a Reviewed-on: https://code.wireshark.org/review/25402 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-20 00:02:20 +00:00
"${_dll_output_dir}"
CMake: Use glib debug dlls in Windows debug builds This prevents the mix of debug/release Universal CRT library in a Wireshark. Bug: 16030 Change-Id: I2961541824caf3bef0a08c72b242427b5406a9bd Reviewed-on: https://code.wireshark.org/review/34444 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-09-03 18:28:52 +00:00
WORKING_DIRECTORY $<IF:$<CONFIG:Debug>,${GLIB2_DLL_DIR_DEBUG},${GLIB2_DLL_DIR_RELEASE}>
COMMAND_EXPAND_LISTS
CMake: File copy updates. Switch from `xcopy`-ing single files to `cmake -E copy_if_different`-ing multiple files on Windows. Add a comment about using copy_if_different for our data files. Switch from `cmake -E copy` to `cmake -E copy_if_different` in a couple of other places. Change-Id: I6bf72f02a66c46a4440280305479f41ffb4e987a Reviewed-on: https://code.wireshark.org/review/25402 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-20 00:02:20 +00:00
)
Fix zlib DLL copy. Switch to "if exist ... xcopy". Change-Id: I255fd3e719645b247024583590b748104c5e15b9 Reviewed-on: https://code.wireshark.org/review/8056 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-13 20:44:23 +00:00
CMake: Add ENABLE_VLD option for MSVC Calling cmake with -DENABLE_VLD=ON when building with Visual Studio, results in debug configuration being linked to Visual Leak Detector. By default, Visual Leak Detector outputs the leak summary to Visual Studio debug window. When ENABLE_VLD is active, VLD is linked to all wireshark libraries and executables.
2021-03-29 10:10:16 +00:00
if (MSVC AND VLD_FOUND)
add_custom_command(TARGET copy_cli_dlls PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E "$<IF:$<CONFIG:Debug>,copy_if_different,true>"
"${VLD_FILES}"
"${_dll_output_dir}"
COMMAND_EXPAND_LISTS
)
endif()
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
# Third party DLLs and PDBs.
set (THIRD_PARTY_DLLS)
set (THIRD_PARTY_PDBS)
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
if (AIRPCAP_FOUND)
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${AIRPCAP_DLL_DIR}/${AIRPCAP_DLL}")
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
endif(AIRPCAP_FOUND)
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${CARES_DLL_DIR}/${CARES_DLL}")
list (APPEND THIRD_PARTY_PDBS "${CARES_DLL_DIR}/${CARES_PDB}")
Windows: Upgrade brotli, libmaxminddb, lz4, and snappy. Upgrade brotli to 1.0.9, libmaxminddb to 1.4.3, lz4 to 1.9.2, and snappy to 1.1.8.
2020-11-30 22:57:01 +00:00
# vcpkg's libmaxminddb is static-only for now. This can be uncommented when
# https://github.com/maxmind/libmaxminddb/commit/3998f42bdb6678cbaa1a543057e5c81ba1668ac2
# percolates up to vcpkg.
# if (MAXMINDDB_FOUND)
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
# list (APPEND THIRD_PARTY_DLLS "${MAXMINDDB_DLL_DIR}/${MAXMINDDB_DLL}")
Windows: Upgrade brotli, libmaxminddb, lz4, and snappy. Upgrade brotli to 1.0.9, libmaxminddb to 1.4.3, lz4 to 1.9.2, and snappy to 1.1.8.
2020-11-30 22:57:01 +00:00
# endif(MAXMINDDB_FOUND)
extcap: add sshdump. sshdump is an extcap module that allows dumping from a remote host using an ssh connection. It goes with the existing extcap plugin interface. Change-Id: I8987614fdd817b8173a50130812bc643a4833bca Reviewed-on: https://code.wireshark.org/review/11402 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-19 10:30:44 +00:00
if (LIBSSH_FOUND)
Windows: upgrade libssh to 0.9.5 Closes #17065
2020-12-08 22:18:39 +00:00
foreach( _dll ${LIBSSH_DLLS} )
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${LIBSSH_DLL_DIR}/${_dll}")
Windows: upgrade libssh to 0.9.5 Closes #17065
2020-12-08 22:18:39 +00:00
endforeach(_dll)
extcap: add sshdump. sshdump is an extcap module that allows dumping from a remote host using an ssh connection. It goes with the existing extcap plugin interface. Change-Id: I8987614fdd817b8173a50130812bc643a4833bca Reviewed-on: https://code.wireshark.org/review/11402 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-19 10:30:44 +00:00
endif(LIBSSH_FOUND)
Make Libgcrypt a mandatory dependency Removed all guards for HAVE_LIBGCRYPT, change autotools and CMake to error out if it is not available. Update release notes, developer documentation and README with the new status. Clarify relation with GnuTLS in macosx-setup.sh. Install Libgcrypt via brew script. Motivation for this change is that many dissectors depend on Libgcrypt and having it optional increases the maintenance burden (there have been several compile issues in the past due to the optional status). Furthermore, wsutil has crypto code that can be replaced by Libgcrypt. Change-Id: Idf0021b8c4cd5db70b8766f7dcc2a8b3acbf042f Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html Reviewed-on: https://code.wireshark.org/review/20030 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-09 14:00:19 +00:00
foreach( _dll ${GCRYPT_DLLS} )
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${GCRYPT_DLL_DIR}/${_dll}")
CMake: File copy updates. Switch from `xcopy`-ing single files to `cmake -E copy_if_different`-ing multiple files on Windows. Add a comment about using copy_if_different for our data files. Switch from `cmake -E copy` to `cmake -E copy_if_different` in a couple of other places. Change-Id: I6bf72f02a66c46a4440280305479f41ffb4e987a Reviewed-on: https://code.wireshark.org/review/25402 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-20 00:02:20 +00:00
endforeach(_dll)
foreach( _dll ${GNUTLS_DLLS} )
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${GNUTLS_DLL_DIR}/${_dll}")
CMake: File copy updates. Switch from `xcopy`-ing single files to `cmake -E copy_if_different`-ing multiple files on Windows. Add a comment about using copy_if_different for our data files. Switch from `cmake -E copy` to `cmake -E copy_if_different` in a couple of other places. Change-Id: I6bf72f02a66c46a4440280305479f41ffb4e987a Reviewed-on: https://code.wireshark.org/review/25402 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-20 00:02:20 +00:00
endforeach(_dll)
foreach( _dll ${KERBEROS_DLLS} )
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${KERBEROS_DLL_DIR}/${_dll}")
Make Libgcrypt a mandatory dependency Removed all guards for HAVE_LIBGCRYPT, change autotools and CMake to error out if it is not available. Update release notes, developer documentation and README with the new status. Clarify relation with GnuTLS in macosx-setup.sh. Install Libgcrypt via brew script. Motivation for this change is that many dissectors depend on Libgcrypt and having it optional increases the maintenance burden (there have been several compile issues in the past due to the optional status). Furthermore, wsutil has crypto code that can be replaced by Libgcrypt. Change-Id: Idf0021b8c4cd5db70b8766f7dcc2a8b3acbf042f Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html Reviewed-on: https://code.wireshark.org/review/20030 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-09 14:00:19 +00:00
endforeach(_dll)
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
if (LUA_FOUND)
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${LUA_DLL_DIR}/${LUA_DLL}")
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
endif(LUA_FOUND)
CQL: add LZ4/Snappy decompression support on Windows Change-Id: I34374cf29357e2ed5062da1a5245b9adbabf732d Reviewed-on: https://code.wireshark.org/review/18249 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-17 19:04:49 +00:00
if (LZ4_FOUND)
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${LZ4_DLL_DIR}/${LZ4_DLL}")
list (APPEND THIRD_PARTY_PDBS "${LZ4_DLL_DIR}/${LZ4_PDB}")
CQL: add LZ4/Snappy decompression support on Windows Change-Id: I34374cf29357e2ed5062da1a5245b9adbabf732d Reviewed-on: https://code.wireshark.org/review/18249 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-17 19:04:49 +00:00
endif(LZ4_FOUND)
Kafka: include zstd compression in Kafka message batches Change-Id: I1d06486ccf7b174ee9aa621fa3d8acb8b3673777 Reviewed-on: https://code.wireshark.org/review/34222 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-12 21:57:45 +00:00
if (ZSTD_FOUND)
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${ZSTD_DLL_DIR}/${ZSTD_DLL}")
Kafka: include zstd compression in Kafka message batches Change-Id: I1d06486ccf7b174ee9aa621fa3d8acb8b3673777 Reviewed-on: https://code.wireshark.org/review/34222 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-12 21:57:45 +00:00
endif(ZSTD_FOUND)
Remove nghttp2 code and use system' nghttp2 Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-26 13:18:29 +00:00
if (NGHTTP2_FOUND)
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${NGHTTP2_DLL_DIR}/${NGHTTP2_DLL}")
list (APPEND THIRD_PARTY_PDBS "${NGHTTP2_DLL_DIR}/${NGHTTP2_PDB}")
Remove nghttp2 code and use system' nghttp2 Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-26 13:18:29 +00:00
endif(NGHTTP2_FOUND)
dfilter: Add support for PCRE2 PCRE2 is the future of PCRE. The only advantage of GRegex is that it comes bundled with GLib, which is not an advantage at all. PCRE2 is widely available, the GRegex abstractions layer are not a good fit and abstract things that don't need abstracting or that we could handle better ourselves, there are open bugs (#12997) and maintenance is spotty at best. GRegex comes with many of the problems of bundled code, aggravated by the fact that it completely falls outside of our control.
2021-10-15 17:34:33 +00:00
if (PCRE2_FOUND)
list (APPEND THIRD_PARTY_DLLS "${PCRE2_DLL_DIR}/${PCRE2_DLL}")
list (APPEND THIRD_PARTY_PDBS "${PCRE2_DLL_DIR}/${PCRE2_PDB}")
endif(PCRE2_FOUND)
Add SBC decoding support to Windows Change-Id: Ibef872dff26c22e2834e958c496c33a5695bb131 Reviewed-on: https://code.wireshark.org/review/18394 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-22 16:15:51 +00:00
if (SBC_FOUND)
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${SBC_DLL_DIR}/${SBC_DLL}")
Add SBC decoding support to Windows Change-Id: Ibef872dff26c22e2834e958c496c33a5695bb131 Reviewed-on: https://code.wireshark.org/review/18394 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-22 16:15:51 +00:00
endif(SBC_FOUND)
codecs: Add support for G.722 and G.726 Integrate the Spandsp library for G.722 and G.726 support. Adds support for G.722 and all eight variants of G.726. Note: this also fixes a crash in Qt (buffer overrun, reading too much data) caused by confusion of the larger output buffer (resample_buff) with the smaller input buffer (decode_buff). It was not triggered before because the sample rate was always 8k, but with the addition of the new codecs, a different sample rate became possible (16k). Fix also a crash which occurs when the RTP_STREAM_DEBUG macro is enabled and the VOIP Calls dialog is opened (the begin frame, start_fd, is not yet known and therfore a NULL dereference could occur). Passes testing (plays normally without bad RTP timing errors) with SampleCaptures files: sip-rtp-g722.pcap and sip-rtp-g726.pcap. Tested with cmake (Qt), autotools (Qt and GTK+) with ASAN enabled. Bug: 5619 Change-Id: I5661908d193927bba50901079119eeff0c04991f Reviewed-on: https://code.wireshark.org/review/18939 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-11-23 23:27:14 +00:00
if (SPANDSP_FOUND)
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${SPANDSP_DLL_DIR}/${SPANDSP_DLL}")
codecs: Add support for G.722 and G.726 Integrate the Spandsp library for G.722 and G.726 support. Adds support for G.722 and all eight variants of G.726. Note: this also fixes a crash in Qt (buffer overrun, reading too much data) caused by confusion of the larger output buffer (resample_buff) with the smaller input buffer (decode_buff). It was not triggered before because the sample rate was always 8k, but with the addition of the new codecs, a different sample rate became possible (16k). Fix also a crash which occurs when the RTP_STREAM_DEBUG macro is enabled and the VOIP Calls dialog is opened (the begin frame, start_fd, is not yet known and therfore a NULL dereference could occur). Passes testing (plays normally without bad RTP timing errors) with SampleCaptures files: sip-rtp-g722.pcap and sip-rtp-g726.pcap. Tested with cmake (Qt), autotools (Qt and GTK+) with ASAN enabled. Bug: 5619 Change-Id: I5661908d193927bba50901079119eeff0c04991f Reviewed-on: https://code.wireshark.org/review/18939 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-11-23 23:27:14 +00:00
endif(SPANDSP_FOUND)
Add G.729 decoding based on bcg729 library Bug: 13635 Change-Id: Ic22a0719a59da13e51425aeb747e88caca0d6512 Reviewed-on: https://code.wireshark.org/review/22808 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-26 21:23:12 +00:00
if (BCG729_FOUND)
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${BCG729_DLL_DIR}/${BCG729_DLL}")
Add G.729 decoding based on bcg729 library Bug: 13635 Change-Id: Ic22a0719a59da13e51425aeb747e88caca0d6512 Reviewed-on: https://code.wireshark.org/review/22808 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-26 21:23:12 +00:00
endif(BCG729_FOUND)
RTP: decode iLBC payload It is possible to decode iLBC payload. It uses libilbc library (https://github.com/TimothyGu/libilbc). Bug: 16314 Change-Id: Id4cad7ae32305a0e94ef32beb24e07733d7f834e Reviewed-on: https://code.wireshark.org/review/35686 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-18 22:55:25 +00:00
if (ILBC_FOUND)
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${ILBC_DLL_DIR}/${ILBC_DLL}")
RTP: decode iLBC payload It is possible to decode iLBC payload. It uses libilbc library (https://github.com/TimothyGu/libilbc). Bug: 16314 Change-Id: Id4cad7ae32305a0e94ef32beb24e07733d7f834e Reviewed-on: https://code.wireshark.org/review/35686 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-18 22:55:25 +00:00
endif(ILBC_FOUND)
RTP: opus playback It's possible to play opus payload with libopus (https://opus-codec.org/). Closes #16882. Helped-by: Pascal Quantin <pascal.quantin@gmail.com> Signed-off-by: Lin Sun <lin.sun@zoom.us> Signed-off-by: Yuanzhi Li <ryanlee@mail.ustc.edu.cn>
2020-09-29 04:33:06 +00:00
if (OPUS_FOUND)
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${OPUS_DLL_DIR}/${OPUS_DLL}")
RTP: opus playback It's possible to play opus payload with libopus (https://opus-codec.org/). Closes #16882. Helped-by: Pascal Quantin <pascal.quantin@gmail.com> Signed-off-by: Lin Sun <lin.sun@zoom.us> Signed-off-by: Yuanzhi Li <ryanlee@mail.ustc.edu.cn>
2020-09-29 04:33:06 +00:00
endif(OPUS_FOUND)
Add libxml2 as optional dependency This can be used by dissectors that need to parse out-of-band configuration. Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783 Reviewed-on: https://code.wireshark.org/review/20912 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-04-04 21:23:59 +00:00
if (LIBXML2_FOUND)
Windows: Start using a `vcpkg export` bundle. Create a library bundle using `vcpkg export ... --zip` as described at https://vcpkg.readthedocs.io/en/latest/users/integration/#export-command. The bundle includes the following packages: gettext 0.19-8 glib 2.52.3-13 libffi 3.1-4 libiconv 1.15-5 liblzma 5.2.4 libxml2 2.9.9-4 pcre 8.41-1 zlib 1.2.11-5 It also includes a CMake toolchain file which we might want to make use of in the future. This means we no longer compile Zlib locally. Update the CMake environment accordingly and remove zlib from win-setup.ps1. It includes PDBs, so add them to the PDB .zip. Change-Id: I0a94904a86d836e990019dab62af506573be1f35 Reviewed-on: https://code.wireshark.org/review/31377 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-04 23:37:46 +00:00
foreach( _dll ${LIBXML2_DLLS} )
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${LIBXML2_DLL_DIR}/${_dll}")
Windows: Start using a `vcpkg export` bundle. Create a library bundle using `vcpkg export ... --zip` as described at https://vcpkg.readthedocs.io/en/latest/users/integration/#export-command. The bundle includes the following packages: gettext 0.19-8 glib 2.52.3-13 libffi 3.1-4 libiconv 1.15-5 liblzma 5.2.4 libxml2 2.9.9-4 pcre 8.41-1 zlib 1.2.11-5 It also includes a CMake toolchain file which we might want to make use of in the future. This means we no longer compile Zlib locally. Update the CMake environment accordingly and remove zlib from win-setup.ps1. It includes PDBs, so add them to the PDB .zip. Change-Id: I0a94904a86d836e990019dab62af506573be1f35 Reviewed-on: https://code.wireshark.org/review/31377 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-04 23:37:46 +00:00
endforeach(_dll)
foreach( _pdb ${LIBXML2_PDBS} )
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_PDBS "${LIBXML2_DLL_DIR}/${_pdb}")
Windows: Start using a `vcpkg export` bundle. Create a library bundle using `vcpkg export ... --zip` as described at https://vcpkg.readthedocs.io/en/latest/users/integration/#export-command. The bundle includes the following packages: gettext 0.19-8 glib 2.52.3-13 libffi 3.1-4 libiconv 1.15-5 liblzma 5.2.4 libxml2 2.9.9-4 pcre 8.41-1 zlib 1.2.11-5 It also includes a CMake toolchain file which we might want to make use of in the future. This means we no longer compile Zlib locally. Update the CMake environment accordingly and remove zlib from win-setup.ps1. It includes PDBs, so add them to the PDB .zip. Change-Id: I0a94904a86d836e990019dab62af506573be1f35 Reviewed-on: https://code.wireshark.org/review/31377 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-04 23:37:46 +00:00
endforeach(_pdb)
Add libxml2 as optional dependency This can be used by dissectors that need to parse out-of-band configuration. Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783 Reviewed-on: https://code.wireshark.org/review/20912 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-04-04 21:23:59 +00:00
endif(LIBXML2_FOUND)
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
if (SMI_FOUND)
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${SMI_DLL_DIR}/${SMI_DLL}")
Fix Windows CMake generated installer to include snmp mibs Wireshark.nsi requires SMI_DIR to point to the base of the SMI directory but FindSMI.cmake doesn't set it. Set it in the main CMakeLists.txt Change-Id: Id667341273d6abb0d2d64ef91cc62d1ce3f42a83 Reviewed-on: https://code.wireshark.org/review/9499 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-07-05 11:47:15 +00:00
# Wireshark.nsi wants SMI_DIR which is the base SMI directory
get_filename_component(SMI_DIR ${SMI_DLL_DIR} DIRECTORY)
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
add_custom_command(TARGET copy_cli_dlls PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory
"${_dll_output_dir}/snmp"
COMMAND ${CMAKE_COMMAND} -E make_directory
"${_dll_output_dir}/snmp/mibs"
COMMAND ${CMAKE_COMMAND} -E copy_directory
SMI_DLL should not be part of directory path for copying MIBs Change-Id: Ib21ff7175fdaf4833398151378cba93d309dd409 Reviewed-on: https://code.wireshark.org/review/15294 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-08 20:46:48 +00:00
"${SMI_SHARE_DIR}/mibs/iana"
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
"${_dll_output_dir}/snmp/mibs"
COMMAND ${CMAKE_COMMAND} -E copy_directory
SMI_DLL should not be part of directory path for copying MIBs Change-Id: Ib21ff7175fdaf4833398151378cba93d309dd409 Reviewed-on: https://code.wireshark.org/review/15294 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-08 20:46:48 +00:00
"${SMI_SHARE_DIR}/mibs/ietf"
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
"${_dll_output_dir}/snmp/mibs"
COMMAND ${CMAKE_COMMAND} -E copy_directory
SMI_DLL should not be part of directory path for copying MIBs Change-Id: Ib21ff7175fdaf4833398151378cba93d309dd409 Reviewed-on: https://code.wireshark.org/review/15294 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-08 20:46:48 +00:00
"${SMI_SHARE_DIR}/mibs/irtf"
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
"${_dll_output_dir}/snmp/mibs"
COMMAND ${CMAKE_COMMAND} -E copy_directory
SMI_DLL should not be part of directory path for copying MIBs Change-Id: Ib21ff7175fdaf4833398151378cba93d309dd409 Reviewed-on: https://code.wireshark.org/review/15294 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-08 20:46:48 +00:00
"${SMI_SHARE_DIR}/mibs/site"
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
"${_dll_output_dir}/snmp/mibs"
COMMAND ${CMAKE_COMMAND} -E copy_directory
SMI_DLL should not be part of directory path for copying MIBs Change-Id: Ib21ff7175fdaf4833398151378cba93d309dd409 Reviewed-on: https://code.wireshark.org/review/15294 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-08 20:46:48 +00:00
"${SMI_SHARE_DIR}/mibs/tubs"
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
"${_dll_output_dir}/snmp/mibs"
COMMAND ${CMAKE_COMMAND} -E copy_directory
SMI_DLL should not be part of directory path for copying MIBs Change-Id: Ib21ff7175fdaf4833398151378cba93d309dd409 Reviewed-on: https://code.wireshark.org/review/15294 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-08 20:46:48 +00:00
"${SMI_SHARE_DIR}/pibs"
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
"${_dll_output_dir}/snmp/mibs"
COMMAND ${CMAKE_COMMAND} -E copy_directory
SMI_DLL should not be part of directory path for copying MIBs Change-Id: Ib21ff7175fdaf4833398151378cba93d309dd409 Reviewed-on: https://code.wireshark.org/review/15294 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-08 20:46:48 +00:00
"${SMI_SHARE_DIR}/yang"
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
"${_dll_output_dir}/snmp/mibs"
Create a Wix Installer This is intended to replace the NSIS installer for Windows. It does not include installing WinPcap or USBPcap. From the research I've done, it seems to make more sense to "bundle" them with Wix ("wrapper" installer that would include Wireshark, WinPcap and USBPcap installers together) TODO: 1. Customize installer with Wireshark graphics 2. Better handling flexibility of installing VC CRT Merge module (need build script to provide appropriate macros). Something like (or modifying existing) FindMSVC_REDIST.cmake. 3. Use Wireshark UpgradeProductCode for install/uninstall. Previous NSIS installer did not have an upgrade code, so there are some backwards compatibility concerns. 4. Uninstall considerations (removing whole directories - plugins, configuration profiles?). NSIS needed to do more things "manually" than Wix does by default. Need to merge as best as possible to handle backwards compatibility. Many thanks to Brian Pratt for all the Wix help. Change-Id: Ib50780214fc7707ba2a46fd96ba8797a1763fa0c Reviewed-on: https://code.wireshark.org/review/14858 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-07 23:03:51 +00:00
#remove the extra directories copied (shallow copying the above would remove the need for this)
COMMAND ${CMAKE_COMMAND} -E remove_directory
"${_dll_output_dir}/snmp/mibs/iana"
COMMAND ${CMAKE_COMMAND} -E remove_directory
"${_dll_output_dir}/snmp/mibs/ietf"
COMMAND ${CMAKE_COMMAND} -E remove_directory
"${_dll_output_dir}/snmp/mibs/site"
COMMAND ${CMAKE_COMMAND} -E remove_directory
"${_dll_output_dir}/snmp/mibs/tubs"
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
)
endif(SMI_FOUND)
CQL: add LZ4/Snappy decompression support on Windows Change-Id: I34374cf29357e2ed5062da1a5245b9adbabf732d Reviewed-on: https://code.wireshark.org/review/18249 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-17 19:04:49 +00:00
if (SNAPPY_FOUND)
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${SNAPPY_DLL_DIR}/${SNAPPY_DLL}")
CQL: add LZ4/Snappy decompression support on Windows Change-Id: I34374cf29357e2ed5062da1a5245b9adbabf732d Reviewed-on: https://code.wireshark.org/review/18249 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-17 19:04:49 +00:00
endif(SNAPPY_FOUND)
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
if (WINSPARKLE_FOUND)
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${WINSPARKLE_DLL_DIR}/${WINSPARKLE_DLL}")
CMake: File copy updates. Switch from `xcopy`-ing single files to `cmake -E copy_if_different`-ing multiple files on Windows. Add a comment about using copy_if_different for our data files. Switch from `cmake -E copy` to `cmake -E copy_if_different` in a couple of other places. Change-Id: I6bf72f02a66c46a4440280305479f41ffb4e987a Reviewed-on: https://code.wireshark.org/review/25402 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-20 00:02:20 +00:00
endif(WINSPARKLE_FOUND)
Windows: Start using a `vcpkg export` bundle. Create a library bundle using `vcpkg export ... --zip` as described at https://vcpkg.readthedocs.io/en/latest/users/integration/#export-command. The bundle includes the following packages: gettext 0.19-8 glib 2.52.3-13 libffi 3.1-4 libiconv 1.15-5 liblzma 5.2.4 libxml2 2.9.9-4 pcre 8.41-1 zlib 1.2.11-5 It also includes a CMake toolchain file which we might want to make use of in the future. This means we no longer compile Zlib locally. Update the CMake environment accordingly and remove zlib from win-setup.ps1. It includes PDBs, so add them to the PDB .zip. Change-Id: I0a94904a86d836e990019dab62af506573be1f35 Reviewed-on: https://code.wireshark.org/review/31377 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-04 23:37:46 +00:00
if (ZLIB_FOUND)
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${ZLIB_DLL_DIR}/${ZLIB_DLL}")
list (APPEND THIRD_PARTY_PDBS "${ZLIB_DLL_DIR}/${ZLIB_PDB}")
Windows: Start using a `vcpkg export` bundle. Create a library bundle using `vcpkg export ... --zip` as described at https://vcpkg.readthedocs.io/en/latest/users/integration/#export-command. The bundle includes the following packages: gettext 0.19-8 glib 2.52.3-13 libffi 3.1-4 libiconv 1.15-5 liblzma 5.2.4 libxml2 2.9.9-4 pcre 8.41-1 zlib 1.2.11-5 It also includes a CMake toolchain file which we might want to make use of in the future. This means we no longer compile Zlib locally. Update the CMake environment accordingly and remove zlib from win-setup.ps1. It includes PDBs, so add them to the PDB .zip. Change-Id: I0a94904a86d836e990019dab62af506573be1f35 Reviewed-on: https://code.wireshark.org/review/31377 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-04 23:37:46 +00:00
endif(ZLIB_FOUND)
Add brotli decompression support for HTTP and HTTP2 dissectors. Change-Id: I9c09f55673187f6fee723fcd72798fb6b9958b03 Reviewed-on: https://code.wireshark.org/review/32745 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-10 10:52:52 +00:00
if (BROTLI_FOUND)
foreach( _dll ${BROTLI_DLLS} )
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
list (APPEND THIRD_PARTY_DLLS "${BROTLI_DLL_DIR}/${_dll}")
Add brotli decompression support for HTTP and HTTP2 dissectors. Change-Id: I9c09f55673187f6fee723fcd72798fb6b9958b03 Reviewed-on: https://code.wireshark.org/review/32745 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-10 10:52:52 +00:00
endforeach(_dll)
endif(BROTLI_FOUND)
CMake: File copy updates. Switch from `xcopy`-ing single files to `cmake -E copy_if_different`-ing multiple files on Windows. Add a comment about using copy_if_different for our data files. Switch from `cmake -E copy` to `cmake -E copy_if_different` in a couple of other places. Change-Id: I6bf72f02a66c46a4440280305479f41ffb4e987a Reviewed-on: https://code.wireshark.org/review/25402 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-20 00:02:20 +00:00
# With libs downloaded to c:/wireshark-win64-libs this currently
# (early 2018) expands to about 1900 characters.
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
if (THIRD_PARTY_DLLS)
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
add_custom_command(TARGET copy_cli_dlls PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
${THIRD_PARTY_DLLS}
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
"${_dll_output_dir}"
CMake: File copy updates. Switch from `xcopy`-ing single files to `cmake -E copy_if_different`-ing multiple files on Windows. Add a comment about using copy_if_different for our data files. Switch from `cmake -E copy` to `cmake -E copy_if_different` in a couple of other places. Change-Id: I6bf72f02a66c46a4440280305479f41ffb4e987a Reviewed-on: https://code.wireshark.org/review/25402 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-20 00:02:20 +00:00
VERBATIM
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
)
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
install(FILES ${THIRD_PARTY_DLLS} DESTINATION "${CMAKE_INSTALL_BINDIR}")
endif(THIRD_PARTY_DLLS)
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
if (THIRD_PARTY_PDBS)
Windows: Use a c-ares DLL built with vcpkg. Update the Windows build environment to use c-ares packages built from a VS 2017 command prompt with set CARES_VERSION=1.15.0 vcpkg install c-ares:x86-windows c-ares:x64-windows vcpkg export c-ares:x86-windows --output=c-ares-%CARES_VERSION%-win32ws --zip vcpkg export c-ares:x64-windows --output=c-ares-%CARES_VERSION%-win64ws --zip The packages also include a PDB, so copy it to the build directory and add it to the PDB .zip. Change-Id: I1887ca89d897bea184144315219b366096519961 Reviewed-on: https://code.wireshark.org/review/31376 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-04 18:14:13 +00:00
add_custom_command(TARGET copy_cli_dlls PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
${THIRD_PARTY_PDBS}
Windows: Use a c-ares DLL built with vcpkg. Update the Windows build environment to use c-ares packages built from a VS 2017 command prompt with set CARES_VERSION=1.15.0 vcpkg install c-ares:x86-windows c-ares:x64-windows vcpkg export c-ares:x86-windows --output=c-ares-%CARES_VERSION%-win32ws --zip vcpkg export c-ares:x64-windows --output=c-ares-%CARES_VERSION%-win64ws --zip The packages also include a PDB, so copy it to the build directory and add it to the PDB .zip. Change-Id: I1887ca89d897bea184144315219b366096519961 Reviewed-on: https://code.wireshark.org/review/31376 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-04 18:14:13 +00:00
"${_dll_output_dir}"
VERBATIM
)
Remove unneeded c-ares checks. C-ares has been mandatory since 451a241e50. Remove some checks that are no longer needed. Rename OPTIONAL_DLLS to THIRD_PARTY_DLLS and OPTIONAL_PDBS to THIRD_PARTY_PDBS in CMakeLists.txt, which is more accurate.
2021-04-26 18:31:25 +00:00
endif(THIRD_PARTY_PDBS)
Windows: Use a c-ares DLL built with vcpkg. Update the Windows build environment to use c-ares packages built from a VS 2017 command prompt with set CARES_VERSION=1.15.0 vcpkg install c-ares:x86-windows c-ares:x64-windows vcpkg export c-ares:x86-windows --output=c-ares-%CARES_VERSION%-win32ws --zip vcpkg export c-ares:x64-windows --output=c-ares-%CARES_VERSION%-win64ws --zip The packages also include a PDB, so copy it to the build directory and add it to the PDB .zip. Change-Id: I1887ca89d897bea184144315219b366096519961 Reviewed-on: https://code.wireshark.org/review/31376 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-04 18:14:13 +00:00
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
add_dependencies(epan copy_cli_dlls)
CMake: Add a pdb_zip_package target. Add a "pdb_zip_package" target similar to the NMake pdb_zip target. Change-Id: I23d114a63fa05f722ee90b77ea458d9e496e5bf9 Reviewed-on: https://code.wireshark.org/review/6673 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-19 21:33:01 +00:00
# We have a lot of choices for creating zip archives:
# - 7z, WinZip, etc., which require a separate download+install.
# - "CMake -E tar cz", which creates a tar file.
# - CPack, which requires a CPack configuration.
# - PowerShell via PSCX or System.IO.Compression.FileSystem.
# - Python via zipfile.
# For now, just look for 7z. It's installed on the Windows builders,
# which might be the only systems that use this target.
find_program(ZIP_EXECUTABLE 7z
PATH "$ENV{PROGRAMFILES}/7-Zip" "$ENV{PROGRAMW6432}/7-Zip"
DOC "Path to the 7z utility."
)
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
if(ZIP_EXECUTABLE)
CMake: Make the pdb_zip_package target passive. Remove the pdb_zip_package target's dependency on epan, otherwise we might end up triggering a build which creates a mismatch. Change-Id: I1e077e5f119273ee80a89c30f54e29fdb242e082 Reviewed-on: https://code.wireshark.org/review/28457 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-26 17:39:24 +00:00
add_custom_target(pdb_zip_package COMMENT "This packages .PDBs but will not create them.")
CMake: Add a pdb_zip_package target. Add a "pdb_zip_package" target similar to the NMake pdb_zip target. Change-Id: I23d114a63fa05f722ee90b77ea458d9e496e5bf9 Reviewed-on: https://code.wireshark.org/review/6673 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-19 21:33:01 +00:00
set_target_properties(pdb_zip_package PROPERTIES FOLDER "Packaging")
CMake: Deduplicate some version variables. Use PROJECT_VERSION instead of VERSION. Prepend "PROJECT_" or "LOG_PROJECT_" as needed to other variables. Remove the leftover unused variables.
2022-06-07 22:51:24 +00:00
set(_pdb_zip "${CMAKE_BINARY_DIR}/Wireshark-pdb-${WIRESHARK_TARGET_PLATFORM}-${PROJECT_VERSION}.zip")
CMake: Add a pdb_zip_package target. Add a "pdb_zip_package" target similar to the NMake pdb_zip target. Change-Id: I23d114a63fa05f722ee90b77ea458d9e496e5bf9 Reviewed-on: https://code.wireshark.org/review/6673 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-19 21:33:01 +00:00
file(TO_NATIVE_PATH "${_pdb_zip}" _pdb_zip_win)
add_custom_command(TARGET pdb_zip_package POST_BUILD
COMMAND ${CMAKE_COMMAND} -E remove -f "${_pdb_zip}"
CMake: Add more .PDBs to pdb_zip_package. Add .PDBs under the extcap and plugin directories to the Wireshark-pdb-xxx.zip package. Change-Id: Icc003a212f21c02bcf8ccf326b43cfebbf32a9a3 Reviewed-on: https://code.wireshark.org/review/26146 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-27 18:10:54 +00:00
COMMAND ${ZIP_EXECUTABLE} a -tzip -mmt=on "${_pdb_zip_win}"
CMake+GitLab CI: Reduce verbosity. For various commands, make sure we show warnings and errors, but not other extraneous information such as filenames.
2021-12-11 21:57:29 +00:00
-bb0 -bd
NSIS: Don't package .pdb files. We run `windeployqt ... --pdbs` at build time, which means that we need to be careful not to include them in the NSIS package. Switch from using wildcards ("File ...\*") to using separate "File" commands for each file. Simplify the PDB Zip package command while we're here. Bug: 16307 Change-Id: Ibd9bcbdfdc216f1f6a067baf711bbc184845143f Reviewed-on: https://code.wireshark.org/review/35670 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-01-06 17:58:38 +00:00
-r *.pdb *.lib
CMake: Add a pdb_zip_package target. Add a "pdb_zip_package" target similar to the NMake pdb_zip target. Change-Id: I23d114a63fa05f722ee90b77ea458d9e496e5bf9 Reviewed-on: https://code.wireshark.org/review/6673 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-19 21:33:01 +00:00
WORKING_DIRECTORY "${_dll_output_dir}"
)
endif()
Windows: Add preliminary support for MSYS2 If we are using MSYS2 we use those packages to build Wireshark using MinGW-w64 and disable most or all of our win-setup.ps1 codepaths. Fix GLib configuration. Disable copying of DLLs with MSYS2. Some tests in the suite_capture test suite are failing with MSYS MINGW64. That particular set of tests is way too brittle regarding file system paths; more work is needed to improve that situation.
2021-09-22 22:02:03 +00:00
endif()
CMake: Copy data files to the run directory. Set DATAFILE_DIR to a value that includes the build configuration. Add a copy_data_files target that copies AUTHORS-SHORT, the default filters, and other support files to the run directory. Add FindPowerShell.cmake and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ declarations which are now covered by copy_data_files. Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 Reviewed-on: https://code.wireshark.org/review/6561 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 21:07:48 +00:00
cmake: fix dependencies for copy_data_files Ensure that files from INSTALL_FILES depend on html_docs, not the parent target copy_data_files (that would not help at all). Ensure that lua scripts are generated before copying them (another moved dependency). Explicitly track the help files that have to be textified for Windows (this finalizes the addition of proper dependencies to copy_data_files targets). Since there is no compelling reason for the extra copy_data_files_depends target now, remove it and move copy_data_files a bit further in the file such that the dependencies can be set. While at it, remove the unnecessary make_directory, the copy_data_files target will create it automatically when copying a file into it. Should fix the problem reported at https://code.wireshark.org/review/12028 Change-Id: I81e56c93ac0fc85e7385605b9c780a80b3d43c85 Reviewed-on: https://code.wireshark.org/review/12130 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-25 10:08:16 +00:00
# List of extra dependencies for the "copy_data_files" target
cmake: add dependency information for copy_data_files Original problem: run/radius/ (and other files) would continuously be copied over because the "copy_directory" command is always invoked, resulting in a newer timestamp (observable via rsync output). Fix 1: convert from "copy_directory" to copying individual files (matched via a glob pattern). Fix 2: add DEPENDS information to the commands, ensuring that the copy commands are only invoked when the file is actually newer. (copy_if_different does not respect timestamp, so use plain copy.) Other visible changes: - radius/Custom.make (automake thingey) is not copied anymore because an explicit list is used with glob patterns. - Removed comment about "default.tt" (gone since v1.99.0-rc1-1684-g07b003a, Makefile.nmake is still untouched though). Due to fix 1, the number of processes increase by about 300. Due to fix 2 however, less processes are executed for repetitive runs. This is visible in the following build time comparison: patch/generator cmake build1 build2 clean before/make 24.86 152.73 3.46 1.04 after/make 24.78 153.08 3.40 1.03 before/ninja 22.99 141.68 0.64 0.24 after/ninja 22.89 141.66 0.10 0.25 cmake is "cmake -DCMAKE_BUILD_TYPE=None -GNinja" (-G"Unix Makefiles"); build1 is invocation of "make -j10"/"ninja" on v2.1.0rc0-668-g94b9907; build2 is the second invocation with this patch; clean is "make clean" or "ninja clean". Numbers are in seconds over 3 runs. This patch has no significant performance impact for the first build, but the second run has improved because the more efficient Ninja generator executes less processes. Change-Id: I7b62556393520044aaaad17dafb82ac137ae73bb Reviewed-on: https://code.wireshark.org/review/12028 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-21 23:16:08 +00:00
set(copy_data_files_depends)
CMake: Copy data files to the run directory. Set DATAFILE_DIR to a value that includes the build configuration. Add a copy_data_files target that copies AUTHORS-SHORT, the default filters, and other support files to the run directory. Add FindPowerShell.cmake and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ declarations which are now covered by copy_data_files. Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 Reviewed-on: https://code.wireshark.org/review/6561 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 21:07:48 +00:00
if(WIN32)
Windows: Get rid of textify.ps1. We used textify.ps1 to ensure that the .txt files in our Windows installers would render properly in Notepad if the user double-clicked on them. Newer versions of Windows have a more sane Notepad, so this is no longer necessary: https://devblogs.microsoft.com/commandline/extended-eol-in-notepad/ Copy COPYING, NEWS, README.md, and README.windows once. Update README.windows. Change-Id: Ibb8b749725f13e0e49d2a2abe04603d9f2be7960 Reviewed-on: https://code.wireshark.org/review/35470 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-12-17 00:42:13 +00:00
foreach(_install_as_txt_file COPYING NEWS README.md README.windows)
# On Windows, install some files with a .txt extension so that they're
# double-clickable.
string(REGEX REPLACE ".md$" "" _no_md_file ${_install_as_txt_file})
set(_output_file "${DATAFILE_DIR}/${_no_md_file}.txt")
add_custom_command(OUTPUT ${_output_file}
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/${_install_as_txt_file}
${_output_file}
CMake: Switch back to shipping README.txt on Windows. Instead of trying to ship README.md, convert its line endings and make sure the result is named README.txt. Change-Id: I4e081587c73342b01633b3a31ea03068e3fc1733 Reviewed-on: https://code.wireshark.org/review/23098 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-16 19:26:42 +00:00
DEPENDS
Windows: Get rid of textify.ps1. We used textify.ps1 to ensure that the .txt files in our Windows installers would render properly in Notepad if the user double-clicked on them. Newer versions of Windows have a more sane Notepad, so this is no longer necessary: https://devblogs.microsoft.com/commandline/extended-eol-in-notepad/ Copy COPYING, NEWS, README.md, and README.windows once. Update README.windows. Change-Id: Ibb8b749725f13e0e49d2a2abe04603d9f2be7960 Reviewed-on: https://code.wireshark.org/review/35470 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-12-17 00:42:13 +00:00
${CMAKE_SOURCE_DIR}/${_install_as_txt_file}
CMake: Switch back to shipping README.txt on Windows. Instead of trying to ship README.md, convert its line endings and make sure the result is named README.txt. Change-Id: I4e081587c73342b01633b3a31ea03068e3fc1733 Reviewed-on: https://code.wireshark.org/review/23098 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-16 19:26:42 +00:00
)
Windows: Get rid of textify.ps1. We used textify.ps1 to ensure that the .txt files in our Windows installers would render properly in Notepad if the user double-clicked on them. Newer versions of Windows have a more sane Notepad, so this is no longer necessary: https://devblogs.microsoft.com/commandline/extended-eol-in-notepad/ Copy COPYING, NEWS, README.md, and README.windows once. Update README.windows. Change-Id: Ibb8b749725f13e0e49d2a2abe04603d9f2be7960 Reviewed-on: https://code.wireshark.org/review/35470 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-12-17 00:42:13 +00:00
list(APPEND copy_data_files_depends "${_output_file}")
CMake: Switch back to shipping README.txt on Windows. Instead of trying to ship README.md, convert its line endings and make sure the result is named README.txt. Change-Id: I4e081587c73342b01633b3a31ea03068e3fc1733 Reviewed-on: https://code.wireshark.org/review/23098 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-08-16 19:26:42 +00:00
endforeach()
CMake: Copy libwireshark dependent DLLs to the target directory. Add a "copy_cli_dlls" target which copies the DLLs required to run our command line programs to the run directory. Fix the spelling of "KERBEROS". Start filling in variables so that we can populate config.nsh. Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 Reviewed-on: https://code.wireshark.org/review/6513 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-12 22:44:42 +00:00
endif()
CMake: Copy data files to the run directory. Set DATAFILE_DIR to a value that includes the build configuration. Add a copy_data_files target that copies AUTHORS-SHORT, the default filters, and other support files to the run directory. Add FindPowerShell.cmake and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ declarations which are now covered by copy_data_files. Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 Reviewed-on: https://code.wireshark.org/review/6561 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 21:07:48 +00:00
foreach(_install_file ${INSTALL_FILES})
cmake: allow building from a UNC source directory Make two minor adjustments to allow building on Windows when the source directory is specified in UNC notation (\\server\volume\directory) instead of mapping such a directory to a drive letter. Cmake's add_custom_command() calls "cd <work_dir>" if a working directory is define as part of the rule. However, cd \\server\volume\directory is not allowed. Modify the two occassions where the working directory is derived from CMAKE_SOURCE_DIR. For copying some install files, we can get away with using the absolute path for each source file to be copied. The perl script that creates the tap listing for lua does not depend on a working directory at all. We can simply remove the WORKING_DIRECTORY parameter. Change-Id: Iac8e0addc44650692c1263fdca11f68315f50c63 Reviewed-on: https://code.wireshark.org/review/22236 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-06-17 07:42:14 +00:00
get_filename_component(_install_file_src "${_install_file}" ABSOLUTE)
CMake: Copy data files to the run directory. Set DATAFILE_DIR to a value that includes the build configuration. Add a copy_data_files target that copies AUTHORS-SHORT, the default filters, and other support files to the run directory. Add FindPowerShell.cmake and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ declarations which are now covered by copy_data_files. Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 Reviewed-on: https://code.wireshark.org/review/6561 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 21:07:48 +00:00
get_filename_component(_install_basename "${_install_file}" NAME)
cmake: add dependency information for copy_data_files Original problem: run/radius/ (and other files) would continuously be copied over because the "copy_directory" command is always invoked, resulting in a newer timestamp (observable via rsync output). Fix 1: convert from "copy_directory" to copying individual files (matched via a glob pattern). Fix 2: add DEPENDS information to the commands, ensuring that the copy commands are only invoked when the file is actually newer. (copy_if_different does not respect timestamp, so use plain copy.) Other visible changes: - radius/Custom.make (automake thingey) is not copied anymore because an explicit list is used with glob patterns. - Removed comment about "default.tt" (gone since v1.99.0-rc1-1684-g07b003a, Makefile.nmake is still untouched though). Due to fix 1, the number of processes increase by about 300. Due to fix 2 however, less processes are executed for repetitive runs. This is visible in the following build time comparison: patch/generator cmake build1 build2 clean before/make 24.86 152.73 3.46 1.04 after/make 24.78 153.08 3.40 1.03 before/ninja 22.99 141.68 0.64 0.24 after/ninja 22.89 141.66 0.10 0.25 cmake is "cmake -DCMAKE_BUILD_TYPE=None -GNinja" (-G"Unix Makefiles"); build1 is invocation of "make -j10"/"ninja" on v2.1.0rc0-668-g94b9907; build2 is the second invocation with this patch; clean is "make clean" or "ninja clean". Numbers are in seconds over 3 runs. This patch has no significant performance impact for the first build, but the second run has improved because the more efficient Ninja generator executes less processes. Change-Id: I7b62556393520044aaaad17dafb82ac137ae73bb Reviewed-on: https://code.wireshark.org/review/12028 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-21 23:16:08 +00:00
set(_output_file "${DATAFILE_DIR}/${_install_basename}")
add_custom_command(OUTPUT "${_output_file}"
CMake: File copy updates. Switch from `xcopy`-ing single files to `cmake -E copy_if_different`-ing multiple files on Windows. Add a comment about using copy_if_different for our data files. Switch from `cmake -E copy` to `cmake -E copy_if_different` in a couple of other places. Change-Id: I6bf72f02a66c46a4440280305479f41ffb4e987a Reviewed-on: https://code.wireshark.org/review/25402 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-20 00:02:20 +00:00
COMMAND ${CMAKE_COMMAND} -E copy_if_different
cmake: allow building from a UNC source directory Make two minor adjustments to allow building on Windows when the source directory is specified in UNC notation (\\server\volume\directory) instead of mapping such a directory to a drive letter. Cmake's add_custom_command() calls "cd <work_dir>" if a working directory is define as part of the rule. However, cd \\server\volume\directory is not allowed. Modify the two occassions where the working directory is derived from CMAKE_SOURCE_DIR. For copying some install files, we can get away with using the absolute path for each source file to be copied. The perl script that creates the tap listing for lua does not depend on a working directory at all. We can simply remove the WORKING_DIRECTORY parameter. Change-Id: Iac8e0addc44650692c1263fdca11f68315f50c63 Reviewed-on: https://code.wireshark.org/review/22236 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-06-17 07:42:14 +00:00
"${_install_file_src}"
cmake: add dependency information for copy_data_files Original problem: run/radius/ (and other files) would continuously be copied over because the "copy_directory" command is always invoked, resulting in a newer timestamp (observable via rsync output). Fix 1: convert from "copy_directory" to copying individual files (matched via a glob pattern). Fix 2: add DEPENDS information to the commands, ensuring that the copy commands are only invoked when the file is actually newer. (copy_if_different does not respect timestamp, so use plain copy.) Other visible changes: - radius/Custom.make (automake thingey) is not copied anymore because an explicit list is used with glob patterns. - Removed comment about "default.tt" (gone since v1.99.0-rc1-1684-g07b003a, Makefile.nmake is still untouched though). Due to fix 1, the number of processes increase by about 300. Due to fix 2 however, less processes are executed for repetitive runs. This is visible in the following build time comparison: patch/generator cmake build1 build2 clean before/make 24.86 152.73 3.46 1.04 after/make 24.78 153.08 3.40 1.03 before/ninja 22.99 141.68 0.64 0.24 after/ninja 22.89 141.66 0.10 0.25 cmake is "cmake -DCMAKE_BUILD_TYPE=None -GNinja" (-G"Unix Makefiles"); build1 is invocation of "make -j10"/"ninja" on v2.1.0rc0-668-g94b9907; build2 is the second invocation with this patch; clean is "make clean" or "ninja clean". Numbers are in seconds over 3 runs. This patch has no significant performance impact for the first build, but the second run has improved because the more efficient Ninja generator executes less processes. Change-Id: I7b62556393520044aaaad17dafb82ac137ae73bb Reviewed-on: https://code.wireshark.org/review/12028 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-21 23:16:08 +00:00
"${_output_file}"
DEPENDS
Revert "CMake: Don't install HTML manuals twice" This reverts commit f1285fcf061669702ca1accd7b2c50ebc8198993. NSIS package is broken with this commit. Change-Id: Ief22a308edad188fa2d5fab79355f19493359fa6 Reviewed-on: https://code.wireshark.org/review/34758 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-10-10 15:34:46 +00:00
docs
cmake: add dependency information for copy_data_files Original problem: run/radius/ (and other files) would continuously be copied over because the "copy_directory" command is always invoked, resulting in a newer timestamp (observable via rsync output). Fix 1: convert from "copy_directory" to copying individual files (matched via a glob pattern). Fix 2: add DEPENDS information to the commands, ensuring that the copy commands are only invoked when the file is actually newer. (copy_if_different does not respect timestamp, so use plain copy.) Other visible changes: - radius/Custom.make (automake thingey) is not copied anymore because an explicit list is used with glob patterns. - Removed comment about "default.tt" (gone since v1.99.0-rc1-1684-g07b003a, Makefile.nmake is still untouched though). Due to fix 1, the number of processes increase by about 300. Due to fix 2 however, less processes are executed for repetitive runs. This is visible in the following build time comparison: patch/generator cmake build1 build2 clean before/make 24.86 152.73 3.46 1.04 after/make 24.78 153.08 3.40 1.03 before/ninja 22.99 141.68 0.64 0.24 after/ninja 22.89 141.66 0.10 0.25 cmake is "cmake -DCMAKE_BUILD_TYPE=None -GNinja" (-G"Unix Makefiles"); build1 is invocation of "make -j10"/"ninja" on v2.1.0rc0-668-g94b9907; build2 is the second invocation with this patch; clean is "make clean" or "ninja clean". Numbers are in seconds over 3 runs. This patch has no significant performance impact for the first build, but the second run has improved because the more efficient Ninja generator executes less processes. Change-Id: I7b62556393520044aaaad17dafb82ac137ae73bb Reviewed-on: https://code.wireshark.org/review/12028 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-21 23:16:08 +00:00
"${_install_file}"
CMake: Copy data files to the run directory. Set DATAFILE_DIR to a value that includes the build configuration. Add a copy_data_files target that copies AUTHORS-SHORT, the default filters, and other support files to the run directory. Add FindPowerShell.cmake and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ declarations which are now covered by copy_data_files. Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 Reviewed-on: https://code.wireshark.org/review/6561 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 21:07:48 +00:00
)
cmake: add dependency information for copy_data_files Original problem: run/radius/ (and other files) would continuously be copied over because the "copy_directory" command is always invoked, resulting in a newer timestamp (observable via rsync output). Fix 1: convert from "copy_directory" to copying individual files (matched via a glob pattern). Fix 2: add DEPENDS information to the commands, ensuring that the copy commands are only invoked when the file is actually newer. (copy_if_different does not respect timestamp, so use plain copy.) Other visible changes: - radius/Custom.make (automake thingey) is not copied anymore because an explicit list is used with glob patterns. - Removed comment about "default.tt" (gone since v1.99.0-rc1-1684-g07b003a, Makefile.nmake is still untouched though). Due to fix 1, the number of processes increase by about 300. Due to fix 2 however, less processes are executed for repetitive runs. This is visible in the following build time comparison: patch/generator cmake build1 build2 clean before/make 24.86 152.73 3.46 1.04 after/make 24.78 153.08 3.40 1.03 before/ninja 22.99 141.68 0.64 0.24 after/ninja 22.89 141.66 0.10 0.25 cmake is "cmake -DCMAKE_BUILD_TYPE=None -GNinja" (-G"Unix Makefiles"); build1 is invocation of "make -j10"/"ninja" on v2.1.0rc0-668-g94b9907; build2 is the second invocation with this patch; clean is "make clean" or "ninja clean". Numbers are in seconds over 3 runs. This patch has no significant performance impact for the first build, but the second run has improved because the more efficient Ninja generator executes less processes. Change-Id: I7b62556393520044aaaad17dafb82ac137ae73bb Reviewed-on: https://code.wireshark.org/review/12028 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-21 23:16:08 +00:00
list(APPEND copy_data_files_depends "${_output_file}")
CMake: Copy data files to the run directory. Set DATAFILE_DIR to a value that includes the build configuration. Add a copy_data_files target that copies AUTHORS-SHORT, the default filters, and other support files to the run directory. Add FindPowerShell.cmake and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ declarations which are now covered by copy_data_files. Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 Reviewed-on: https://code.wireshark.org/review/6561 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 21:07:48 +00:00
endforeach()
Add a default configuration profile for Logray. Add and install default coloring rules and filter buttons for Logray. Add is_packet_configuration_namespace() and use it to set the default timestamp type for Logray to "Absolute", which is more appropriate for log entries.
2022-06-17 22:22:26 +00:00
if (BUILD_logray AND ENABLE_APPLICATION_BUNDLE)
foreach(_install_file ${LOG_INSTALL_FILES})
get_filename_component(_install_file_src "${_install_file}" ABSOLUTE)
get_filename_component(_install_basename "${_install_file}" NAME)
set(_output_file "${LOG_DATAFILE_DIR}/${_install_basename}")
add_custom_command(OUTPUT "${_output_file}"
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${_install_file_src}"
"${_output_file}"
DEPENDS
docs
"${_install_file}"
)
list(APPEND copy_data_files_depends "${_output_file}")
endforeach()
endif()
Lua is a proper name. Fix its capitalization.
2021-11-10 23:51:29 +00:00
# Install Lua files in staging directory such that Lua can used when Wireshark
cmake: add dependency information for copy_data_files Original problem: run/radius/ (and other files) would continuously be copied over because the "copy_directory" command is always invoked, resulting in a newer timestamp (observable via rsync output). Fix 1: convert from "copy_directory" to copying individual files (matched via a glob pattern). Fix 2: add DEPENDS information to the commands, ensuring that the copy commands are only invoked when the file is actually newer. (copy_if_different does not respect timestamp, so use plain copy.) Other visible changes: - radius/Custom.make (automake thingey) is not copied anymore because an explicit list is used with glob patterns. - Removed comment about "default.tt" (gone since v1.99.0-rc1-1684-g07b003a, Makefile.nmake is still untouched though). Due to fix 1, the number of processes increase by about 300. Due to fix 2 however, less processes are executed for repetitive runs. This is visible in the following build time comparison: patch/generator cmake build1 build2 clean before/make 24.86 152.73 3.46 1.04 after/make 24.78 153.08 3.40 1.03 before/ninja 22.99 141.68 0.64 0.24 after/ninja 22.89 141.66 0.10 0.25 cmake is "cmake -DCMAKE_BUILD_TYPE=None -GNinja" (-G"Unix Makefiles"); build1 is invocation of "make -j10"/"ninja" on v2.1.0rc0-668-g94b9907; build2 is the second invocation with this patch; clean is "make clean" or "ninja clean". Numbers are in seconds over 3 runs. This patch has no significant performance impact for the first build, but the second run has improved because the more efficient Ninja generator executes less processes. Change-Id: I7b62556393520044aaaad17dafb82ac137ae73bb Reviewed-on: https://code.wireshark.org/review/12028 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-21 23:16:08 +00:00
# is ran from the build directory. For install targets, see
# epan/wslua/CMakeLists.txt
Add Lua dependings only if LUA is enabled Avoid build fail if found Lua but it is disabled. Change-Id: If1cf0d650454d2844a1430135de1385c984e5ba4 Reviewed-on: https://code.wireshark.org/review/13394 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-30 18:26:59 +00:00
if(LUA_FOUND AND ENABLE_LUA)
cmake: add dependency information for copy_data_files Original problem: run/radius/ (and other files) would continuously be copied over because the "copy_directory" command is always invoked, resulting in a newer timestamp (observable via rsync output). Fix 1: convert from "copy_directory" to copying individual files (matched via a glob pattern). Fix 2: add DEPENDS information to the commands, ensuring that the copy commands are only invoked when the file is actually newer. (copy_if_different does not respect timestamp, so use plain copy.) Other visible changes: - radius/Custom.make (automake thingey) is not copied anymore because an explicit list is used with glob patterns. - Removed comment about "default.tt" (gone since v1.99.0-rc1-1684-g07b003a, Makefile.nmake is still untouched though). Due to fix 1, the number of processes increase by about 300. Due to fix 2 however, less processes are executed for repetitive runs. This is visible in the following build time comparison: patch/generator cmake build1 build2 clean before/make 24.86 152.73 3.46 1.04 after/make 24.78 153.08 3.40 1.03 before/ninja 22.99 141.68 0.64 0.24 after/ninja 22.89 141.66 0.10 0.25 cmake is "cmake -DCMAKE_BUILD_TYPE=None -GNinja" (-G"Unix Makefiles"); build1 is invocation of "make -j10"/"ninja" on v2.1.0rc0-668-g94b9907; build2 is the second invocation with this patch; clean is "make clean" or "ninja clean". Numbers are in seconds over 3 runs. This patch has no significant performance impact for the first build, but the second run has improved because the more efficient Ninja generator executes less processes. Change-Id: I7b62556393520044aaaad17dafb82ac137ae73bb Reviewed-on: https://code.wireshark.org/review/12028 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-21 23:16:08 +00:00
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"
CMake: Copy data files to the run directory. Set DATAFILE_DIR to a value that includes the build configuration. Add a copy_data_files target that copies AUTHORS-SHORT, the default filters, and other support files to the run directory. Add FindPowerShell.cmake and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ declarations which are now covered by copy_data_files. Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 Reviewed-on: https://code.wireshark.org/review/6561 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 21:07:48 +00:00
)
cmake: add dependency information for copy_data_files Original problem: run/radius/ (and other files) would continuously be copied over because the "copy_directory" command is always invoked, resulting in a newer timestamp (observable via rsync output). Fix 1: convert from "copy_directory" to copying individual files (matched via a glob pattern). Fix 2: add DEPENDS information to the commands, ensuring that the copy commands are only invoked when the file is actually newer. (copy_if_different does not respect timestamp, so use plain copy.) Other visible changes: - radius/Custom.make (automake thingey) is not copied anymore because an explicit list is used with glob patterns. - Removed comment about "default.tt" (gone since v1.99.0-rc1-1684-g07b003a, Makefile.nmake is still untouched though). Due to fix 1, the number of processes increase by about 300. Due to fix 2 however, less processes are executed for repetitive runs. This is visible in the following build time comparison: patch/generator cmake build1 build2 clean before/make 24.86 152.73 3.46 1.04 after/make 24.78 153.08 3.40 1.03 before/ninja 22.99 141.68 0.64 0.24 after/ninja 22.89 141.66 0.10 0.25 cmake is "cmake -DCMAKE_BUILD_TYPE=None -GNinja" (-G"Unix Makefiles"); build1 is invocation of "make -j10"/"ninja" on v2.1.0rc0-668-g94b9907; build2 is the second invocation with this patch; clean is "make clean" or "ninja clean". Numbers are in seconds over 3 runs. This patch has no significant performance impact for the first build, but the second run has improved because the more efficient Ninja generator executes less processes. Change-Id: I7b62556393520044aaaad17dafb82ac137ae73bb Reviewed-on: https://code.wireshark.org/review/12028 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-21 23:16:08 +00:00
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}"
CMake: File copy updates. Switch from `xcopy`-ing single files to `cmake -E copy_if_different`-ing multiple files on Windows. Add a comment about using copy_if_different for our data files. Switch from `cmake -E copy` to `cmake -E copy_if_different` in a couple of other places. Change-Id: I6bf72f02a66c46a4440280305479f41ffb4e987a Reviewed-on: https://code.wireshark.org/review/25402 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-20 00:02:20 +00:00
COMMAND ${CMAKE_COMMAND} -E copy_if_different
cmake: add dependency information for copy_data_files Original problem: run/radius/ (and other files) would continuously be copied over because the "copy_directory" command is always invoked, resulting in a newer timestamp (observable via rsync output). Fix 1: convert from "copy_directory" to copying individual files (matched via a glob pattern). Fix 2: add DEPENDS information to the commands, ensuring that the copy commands are only invoked when the file is actually newer. (copy_if_different does not respect timestamp, so use plain copy.) Other visible changes: - radius/Custom.make (automake thingey) is not copied anymore because an explicit list is used with glob patterns. - Removed comment about "default.tt" (gone since v1.99.0-rc1-1684-g07b003a, Makefile.nmake is still untouched though). Due to fix 1, the number of processes increase by about 300. Due to fix 2 however, less processes are executed for repetitive runs. This is visible in the following build time comparison: patch/generator cmake build1 build2 clean before/make 24.86 152.73 3.46 1.04 after/make 24.78 153.08 3.40 1.03 before/ninja 22.99 141.68 0.64 0.24 after/ninja 22.89 141.66 0.10 0.25 cmake is "cmake -DCMAKE_BUILD_TYPE=None -GNinja" (-G"Unix Makefiles"); build1 is invocation of "make -j10"/"ninja" on v2.1.0rc0-668-g94b9907; build2 is the second invocation with this patch; clean is "make clean" or "ninja clean". Numbers are in seconds over 3 runs. This patch has no significant performance impact for the first build, but the second run has improved because the more efficient Ninja generator executes less processes. Change-Id: I7b62556393520044aaaad17dafb82ac137ae73bb Reviewed-on: https://code.wireshark.org/review/12028 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-21 23:16:08 +00:00
"${_lua_file}"
"${DATAFILE_DIR}/${_lua_filename}"
DEPENDS
cmake: fix dependencies for copy_data_files Ensure that files from INSTALL_FILES depend on html_docs, not the parent target copy_data_files (that would not help at all). Ensure that lua scripts are generated before copying them (another moved dependency). Explicitly track the help files that have to be textified for Windows (this finalizes the addition of proper dependencies to copy_data_files targets). Since there is no compelling reason for the extra copy_data_files_depends target now, remove it and move copy_data_files a bit further in the file such that the dependencies can be set. While at it, remove the unnecessary make_directory, the copy_data_files target will create it automatically when copying a file into it. Should fix the problem reported at https://code.wireshark.org/review/12028 Change-Id: I81e56c93ac0fc85e7385605b9c780a80b3d43c85 Reviewed-on: https://code.wireshark.org/review/12130 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-25 10:08:16 +00:00
wsluaauxiliary
cmake: add dependency information for copy_data_files Original problem: run/radius/ (and other files) would continuously be copied over because the "copy_directory" command is always invoked, resulting in a newer timestamp (observable via rsync output). Fix 1: convert from "copy_directory" to copying individual files (matched via a glob pattern). Fix 2: add DEPENDS information to the commands, ensuring that the copy commands are only invoked when the file is actually newer. (copy_if_different does not respect timestamp, so use plain copy.) Other visible changes: - radius/Custom.make (automake thingey) is not copied anymore because an explicit list is used with glob patterns. - Removed comment about "default.tt" (gone since v1.99.0-rc1-1684-g07b003a, Makefile.nmake is still untouched though). Due to fix 1, the number of processes increase by about 300. Due to fix 2 however, less processes are executed for repetitive runs. This is visible in the following build time comparison: patch/generator cmake build1 build2 clean before/make 24.86 152.73 3.46 1.04 after/make 24.78 153.08 3.40 1.03 before/ninja 22.99 141.68 0.64 0.24 after/ninja 22.89 141.66 0.10 0.25 cmake is "cmake -DCMAKE_BUILD_TYPE=None -GNinja" (-G"Unix Makefiles"); build1 is invocation of "make -j10"/"ninja" on v2.1.0rc0-668-g94b9907; build2 is the second invocation with this patch; clean is "make clean" or "ninja clean". Numbers are in seconds over 3 runs. This patch has no significant performance impact for the first build, but the second run has improved because the more efficient Ninja generator executes less processes. Change-Id: I7b62556393520044aaaad17dafb82ac137ae73bb Reviewed-on: https://code.wireshark.org/review/12028 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-21 23:16:08 +00:00
"${_lua_file}"
)
endforeach()
CMake: Fix an endif. Fix CMake Warning (dev) in CMakeLists.txt: A logical block opening on the line C:/Development/wireshark-w64/CMakeLists.txt:1649 (if) closes on the line C:/Development/wireshark-w64/CMakeLists.txt:1668 (endif) with mis-matching arguments. This warning is for project developers. Use -Wno-dev to suppress it. Change-Id: I6b6060e4d88b385deb81111234e3229d104772f1 Reviewed-on: https://code.wireshark.org/review/13407 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-18 21:50:42 +00:00
endif(LUA_FOUND AND ENABLE_LUA)
Revert "CMake: Don't install HTML manuals twice" This reverts commit f1285fcf061669702ca1accd7b2c50ebc8198993. NSIS package is broken with this commit. Change-Id: Ief22a308edad188fa2d5fab79355f19493359fa6 Reviewed-on: https://code.wireshark.org/review/34758 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-10-10 15:34:46 +00:00
# doc/*.html handled elsewhere.
cmake: add dependency information for copy_data_files Original problem: run/radius/ (and other files) would continuously be copied over because the "copy_directory" command is always invoked, resulting in a newer timestamp (observable via rsync output). Fix 1: convert from "copy_directory" to copying individual files (matched via a glob pattern). Fix 2: add DEPENDS information to the commands, ensuring that the copy commands are only invoked when the file is actually newer. (copy_if_different does not respect timestamp, so use plain copy.) Other visible changes: - radius/Custom.make (automake thingey) is not copied anymore because an explicit list is used with glob patterns. - Removed comment about "default.tt" (gone since v1.99.0-rc1-1684-g07b003a, Makefile.nmake is still untouched though). Due to fix 1, the number of processes increase by about 300. Due to fix 2 however, less processes are executed for repetitive runs. This is visible in the following build time comparison: patch/generator cmake build1 build2 clean before/make 24.86 152.73 3.46 1.04 after/make 24.78 153.08 3.40 1.03 before/ninja 22.99 141.68 0.64 0.24 after/ninja 22.89 141.66 0.10 0.25 cmake is "cmake -DCMAKE_BUILD_TYPE=None -GNinja" (-G"Unix Makefiles"); build1 is invocation of "make -j10"/"ninja" on v2.1.0rc0-668-g94b9907; build2 is the second invocation with this patch; clean is "make clean" or "ninja clean". Numbers are in seconds over 3 runs. This patch has no significant performance impact for the first build, but the second run has improved because the more efficient Ninja generator executes less processes. Change-Id: I7b62556393520044aaaad17dafb82ac137ae73bb Reviewed-on: https://code.wireshark.org/review/12028 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-21 23:16:08 +00:00
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
set(_protocol_data_dir ${CMAKE_SOURCE_DIR}/resources/protocols)
Convert the FAQ to Asciidoctor and remove old help files. Convert our self-generating FAQ to Asciidoctor via the following steps: - `help/faq.py > /tmp/faq.html`. - `pandoc -t asciidoc -o docbook/faq.adoc /tmp/faq.html`. - Manually clean up the markup using a text editor. Question and answer content was left intact. Removing or updating obsolete content will have to be done in a separate change. The Asciidoctor project uses the .adoc extension, so start using it here as well. The contents of the "help" directory appear to have been used for offline support in help_url.c, but that functionality was removed in 2008 in 242e3b78bc. Its content is covered in the User's Guide and man pages so remove it. Change-Id: I9060eefe97cfc137f8b414077c30f814379b576a Reviewed-on: https://code.wireshark.org/review/32014 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-11 22:24:18 +00:00
# Glob patterns relative to the source directory that should be copied to
# ${DATAFILE_DIR} (including directory prefixes)
cmake: add dependency information for copy_data_files Original problem: run/radius/ (and other files) would continuously be copied over because the "copy_directory" command is always invoked, resulting in a newer timestamp (observable via rsync output). Fix 1: convert from "copy_directory" to copying individual files (matched via a glob pattern). Fix 2: add DEPENDS information to the commands, ensuring that the copy commands are only invoked when the file is actually newer. (copy_if_different does not respect timestamp, so use plain copy.) Other visible changes: - radius/Custom.make (automake thingey) is not copied anymore because an explicit list is used with glob patterns. - Removed comment about "default.tt" (gone since v1.99.0-rc1-1684-g07b003a, Makefile.nmake is still untouched though). Due to fix 1, the number of processes increase by about 300. Due to fix 2 however, less processes are executed for repetitive runs. This is visible in the following build time comparison: patch/generator cmake build1 build2 clean before/make 24.86 152.73 3.46 1.04 after/make 24.78 153.08 3.40 1.03 before/ninja 22.99 141.68 0.64 0.24 after/ninja 22.89 141.66 0.10 0.25 cmake is "cmake -DCMAKE_BUILD_TYPE=None -GNinja" (-G"Unix Makefiles"); build1 is invocation of "make -j10"/"ninja" on v2.1.0rc0-668-g94b9907; build2 is the second invocation with this patch; clean is "make clean" or "ninja clean". Numbers are in seconds over 3 runs. This patch has no significant performance impact for the first build, but the second run has improved because the more efficient Ninja generator executes less processes. Change-Id: I7b62556393520044aaaad17dafb82ac137ae73bb Reviewed-on: https://code.wireshark.org/review/12028 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-21 23:16:08 +00:00
# TODO shouldn't this use full (relative) paths instead of glob patterns?
Convert the FAQ to Asciidoctor and remove old help files. Convert our self-generating FAQ to Asciidoctor via the following steps: - `help/faq.py > /tmp/faq.html`. - `pandoc -t asciidoc -o docbook/faq.adoc /tmp/faq.html`. - Manually clean up the markup using a text editor. Question and answer content was left intact. Removing or updating obsolete content will have to be done in a separate change. The Asciidoctor project uses the .adoc extension, so start using it here as well. The contents of the "help" directory appear to have been used for offline support in help_url.c, but that functionality was removed in 2008 in 242e3b78bc. Its content is covered in the User's Guide and man pages so remove it. Change-Id: I9060eefe97cfc137f8b414077c30f814379b576a Reviewed-on: https://code.wireshark.org/review/32014 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-11 22:24:18 +00:00
set(DATA_FILES_SRC
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
${_protocol_data_dir}/tpncp/tpncp.dat
${_protocol_data_dir}/wimaxasncp/*.dtd
${_protocol_data_dir}/wimaxasncp/*.xml
CMake: Copy data files to the run directory. Set DATAFILE_DIR to a value that includes the build configuration. Add a copy_data_files target that copies AUTHORS-SHORT, the default filters, and other support files to the run directory. Add FindPowerShell.cmake and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ declarations which are now covered by copy_data_files. Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 Reviewed-on: https://code.wireshark.org/review/6561 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 21:07:48 +00:00
)
cmake: add dependency information for copy_data_files Original problem: run/radius/ (and other files) would continuously be copied over because the "copy_directory" command is always invoked, resulting in a newer timestamp (observable via rsync output). Fix 1: convert from "copy_directory" to copying individual files (matched via a glob pattern). Fix 2: add DEPENDS information to the commands, ensuring that the copy commands are only invoked when the file is actually newer. (copy_if_different does not respect timestamp, so use plain copy.) Other visible changes: - radius/Custom.make (automake thingey) is not copied anymore because an explicit list is used with glob patterns. - Removed comment about "default.tt" (gone since v1.99.0-rc1-1684-g07b003a, Makefile.nmake is still untouched though). Due to fix 1, the number of processes increase by about 300. Due to fix 2 however, less processes are executed for repetitive runs. This is visible in the following build time comparison: patch/generator cmake build1 build2 clean before/make 24.86 152.73 3.46 1.04 after/make 24.78 153.08 3.40 1.03 before/ninja 22.99 141.68 0.64 0.24 after/ninja 22.89 141.66 0.10 0.25 cmake is "cmake -DCMAKE_BUILD_TYPE=None -GNinja" (-G"Unix Makefiles"); build1 is invocation of "make -j10"/"ninja" on v2.1.0rc0-668-g94b9907; build2 is the second invocation with this patch; clean is "make clean" or "ninja clean". Numbers are in seconds over 3 runs. This patch has no significant performance impact for the first build, but the second run has improved because the more efficient Ninja generator executes less processes. Change-Id: I7b62556393520044aaaad17dafb82ac137ae73bb Reviewed-on: https://code.wireshark.org/review/12028 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-21 23:16:08 +00:00
# Copy all paths from the source tree to the data directory. Directories are
# automatically created if missing as the filename is given.
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
file(GLOB _data_files RELATIVE ${_protocol_data_dir} ${DATA_FILES_SRC})
cmake: add dependency information for copy_data_files Original problem: run/radius/ (and other files) would continuously be copied over because the "copy_directory" command is always invoked, resulting in a newer timestamp (observable via rsync output). Fix 1: convert from "copy_directory" to copying individual files (matched via a glob pattern). Fix 2: add DEPENDS information to the commands, ensuring that the copy commands are only invoked when the file is actually newer. (copy_if_different does not respect timestamp, so use plain copy.) Other visible changes: - radius/Custom.make (automake thingey) is not copied anymore because an explicit list is used with glob patterns. - Removed comment about "default.tt" (gone since v1.99.0-rc1-1684-g07b003a, Makefile.nmake is still untouched though). Due to fix 1, the number of processes increase by about 300. Due to fix 2 however, less processes are executed for repetitive runs. This is visible in the following build time comparison: patch/generator cmake build1 build2 clean before/make 24.86 152.73 3.46 1.04 after/make 24.78 153.08 3.40 1.03 before/ninja 22.99 141.68 0.64 0.24 after/ninja 22.89 141.66 0.10 0.25 cmake is "cmake -DCMAKE_BUILD_TYPE=None -GNinja" (-G"Unix Makefiles"); build1 is invocation of "make -j10"/"ninja" on v2.1.0rc0-668-g94b9907; build2 is the second invocation with this patch; clean is "make clean" or "ninja clean". Numbers are in seconds over 3 runs. This patch has no significant performance impact for the first build, but the second run has improved because the more efficient Ninja generator executes less processes. Change-Id: I7b62556393520044aaaad17dafb82ac137ae73bb Reviewed-on: https://code.wireshark.org/review/12028 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-21 23:16:08 +00:00
foreach(_data_file ${_data_files})
add_custom_command(OUTPUT "${DATAFILE_DIR}/${_data_file}"
CMake: File copy updates. Switch from `xcopy`-ing single files to `cmake -E copy_if_different`-ing multiple files on Windows. Add a comment about using copy_if_different for our data files. Switch from `cmake -E copy` to `cmake -E copy_if_different` in a couple of other places. Change-Id: I6bf72f02a66c46a4440280305479f41ffb4e987a Reviewed-on: https://code.wireshark.org/review/25402 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-20 00:02:20 +00:00
COMMAND ${CMAKE_COMMAND} -E copy_if_different
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
${_protocol_data_dir}/${_data_file}
${DATAFILE_DIR}/${_data_file}
cmake: add dependency information for copy_data_files Original problem: run/radius/ (and other files) would continuously be copied over because the "copy_directory" command is always invoked, resulting in a newer timestamp (observable via rsync output). Fix 1: convert from "copy_directory" to copying individual files (matched via a glob pattern). Fix 2: add DEPENDS information to the commands, ensuring that the copy commands are only invoked when the file is actually newer. (copy_if_different does not respect timestamp, so use plain copy.) Other visible changes: - radius/Custom.make (automake thingey) is not copied anymore because an explicit list is used with glob patterns. - Removed comment about "default.tt" (gone since v1.99.0-rc1-1684-g07b003a, Makefile.nmake is still untouched though). Due to fix 1, the number of processes increase by about 300. Due to fix 2 however, less processes are executed for repetitive runs. This is visible in the following build time comparison: patch/generator cmake build1 build2 clean before/make 24.86 152.73 3.46 1.04 after/make 24.78 153.08 3.40 1.03 before/ninja 22.99 141.68 0.64 0.24 after/ninja 22.89 141.66 0.10 0.25 cmake is "cmake -DCMAKE_BUILD_TYPE=None -GNinja" (-G"Unix Makefiles"); build1 is invocation of "make -j10"/"ninja" on v2.1.0rc0-668-g94b9907; build2 is the second invocation with this patch; clean is "make clean" or "ninja clean". Numbers are in seconds over 3 runs. This patch has no significant performance impact for the first build, but the second run has improved because the more efficient Ninja generator executes less processes. Change-Id: I7b62556393520044aaaad17dafb82ac137ae73bb Reviewed-on: https://code.wireshark.org/review/12028 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-21 23:16:08 +00:00
DEPENDS
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
${_protocol_data_dir}/${_data_file}
CMake: Copy data files to the run directory. Set DATAFILE_DIR to a value that includes the build configuration. Add a copy_data_files target that copies AUTHORS-SHORT, the default filters, and other support files to the run directory. Add FindPowerShell.cmake and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ declarations which are now covered by copy_data_files. Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 Reviewed-on: https://code.wireshark.org/review/6561 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 21:07:48 +00:00
)
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
list(APPEND copy_data_files_depends ${DATAFILE_DIR}/${_data_file})
CMake: Copy data files to the run directory. Set DATAFILE_DIR to a value that includes the build configuration. Add a copy_data_files target that copies AUTHORS-SHORT, the default filters, and other support files to the run directory. Add FindPowerShell.cmake and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ declarations which are now covered by copy_data_files. Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 Reviewed-on: https://code.wireshark.org/review/6561 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 21:07:48 +00:00
endforeach()
cmake: add dependency information for copy_data_files Original problem: run/radius/ (and other files) would continuously be copied over because the "copy_directory" command is always invoked, resulting in a newer timestamp (observable via rsync output). Fix 1: convert from "copy_directory" to copying individual files (matched via a glob pattern). Fix 2: add DEPENDS information to the commands, ensuring that the copy commands are only invoked when the file is actually newer. (copy_if_different does not respect timestamp, so use plain copy.) Other visible changes: - radius/Custom.make (automake thingey) is not copied anymore because an explicit list is used with glob patterns. - Removed comment about "default.tt" (gone since v1.99.0-rc1-1684-g07b003a, Makefile.nmake is still untouched though). Due to fix 1, the number of processes increase by about 300. Due to fix 2 however, less processes are executed for repetitive runs. This is visible in the following build time comparison: patch/generator cmake build1 build2 clean before/make 24.86 152.73 3.46 1.04 after/make 24.78 153.08 3.40 1.03 before/ninja 22.99 141.68 0.64 0.24 after/ninja 22.89 141.66 0.10 0.25 cmake is "cmake -DCMAKE_BUILD_TYPE=None -GNinja" (-G"Unix Makefiles"); build1 is invocation of "make -j10"/"ninja" on v2.1.0rc0-668-g94b9907; build2 is the second invocation with this patch; clean is "make clean" or "ninja clean". Numbers are in seconds over 3 runs. This patch has no significant performance impact for the first build, but the second run has improved because the more efficient Ninja generator executes less processes. Change-Id: I7b62556393520044aaaad17dafb82ac137ae73bb Reviewed-on: https://code.wireshark.org/review/12028 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-21 23:16:08 +00:00
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
file(GLOB _dtds_src_files RELATIVE ${_protocol_data_dir} ${_protocol_data_dir}/dtds/*.dtd)
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
set (_dtds_data_files)
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
set (_dtds_dep_files)
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
foreach(_data_file ${_dtds_src_files})
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
list(APPEND _dtds_data_files ${DATAFILE_DIR}/${_data_file})
CMake: Fix our dtds dependencies.
2022-03-19 17:36:05 +00:00
list(APPEND _dtds_dep_files ${_protocol_data_dir}/${_data_file})
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
endforeach()
add_custom_command(
OUTPUT ${_dtds_data_files}
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
COMMAND ${CMAKE_COMMAND} -E make_directory ${DATAFILE_DIR}/dtds
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
COMMAND ${CMAKE_COMMAND} -E copy_if_different
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
${_dtds_src_files}
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
${DATAFILE_DIR}/dtds
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
VERBATIM
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
DEPENDS ${_dtds_dep_files}
WORKING_DIRECTORY ${_protocol_data_dir}
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
)
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
file(GLOB _diameter_src_files RELATIVE ${_protocol_data_dir}
${_protocol_data_dir}/diameter/*.dtd
${_protocol_data_dir}/diameter/*.xml
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
)
set (_diameter_data_files)
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
set (_diameter_dep_files)
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
foreach(_data_file ${_diameter_src_files})
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
list(APPEND _diameter_data_files ${DATAFILE_DIR}/${_data_file})
list(APPEND _diameter_dep_files ${_protocol_data_dir}/${_data_file})
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
endforeach()
add_custom_command(
OUTPUT ${_diameter_data_files}
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
COMMAND ${CMAKE_COMMAND} -E make_directory ${DATAFILE_DIR}/diameter
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
COMMAND ${CMAKE_COMMAND} -E copy_if_different
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
${_diameter_src_files}
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
${DATAFILE_DIR}/diameter
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
VERBATIM
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
DEPENDS ${_diameter_dep_files}
WORKING_DIRECTORY ${_protocol_data_dir}
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
)
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
file(GLOB _radius_src_files RELATIVE ${_protocol_data_dir}
${_protocol_data_dir}/radius/README.radius_dictionary
${_protocol_data_dir}/radius/custom.includes
${_protocol_data_dir}/radius/dictionary
${_protocol_data_dir}/radius/dictionary.*
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
)
set (_radius_data_files)
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
set (_radius_dep_files)
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
foreach(_data_file ${_radius_src_files})
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
list(APPEND _radius_data_files ${DATAFILE_DIR}/${_data_file})
list(APPEND _radius_dep_files ${_protocol_data_dir}/${_data_file})
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
endforeach()
add_custom_command(
OUTPUT ${_radius_data_files}
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
COMMAND ${CMAKE_COMMAND} -E make_directory ${DATAFILE_DIR}/radius
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
COMMAND ${CMAKE_COMMAND} -E copy_if_different
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
${_radius_src_files}
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
${DATAFILE_DIR}/radius
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
VERBATIM
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
DEPENDS ${_radius_dep_files}
WORKING_DIRECTORY ${_protocol_data_dir}
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
)
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
file(GLOB _protobuf_src_files RELATIVE ${_protocol_data_dir}
${_protocol_data_dir}/protobuf/*.proto
)
Add SparkplugB dissector Add a dissector for SparkplugB as a heuristic subdissector of MQTT and which calls protobuf to dissect the messages payload.
2021-04-10 18:15:34 +00:00
set (_protobuf_data_files)
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
set (_protobuf_dep_files)
Add SparkplugB dissector Add a dissector for SparkplugB as a heuristic subdissector of MQTT and which calls protobuf to dissect the messages payload.
2021-04-10 18:15:34 +00:00
foreach(_data_file ${_protobuf_src_files})
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
list(APPEND _protobuf_data_files ${DATAFILE_DIR}/${_data_file})
CMakeLists: Fix the error reported when Wireshark code is recompiled The reference variable is incorrect. As a result, the file in this directory(/resources/protocols/protobuf/sparkplug_b.proto) are deleted during recompilation. so compilation errors occur. Related to #18013
2022-03-25 11:31:43 +00:00
list(APPEND _protobuf_dep_files ${_protocol_data_dir}/${_data_file})
Add SparkplugB dissector Add a dissector for SparkplugB as a heuristic subdissector of MQTT and which calls protobuf to dissect the messages payload.
2021-04-10 18:15:34 +00:00
endforeach()
add_custom_command(
OUTPUT ${_protobuf_data_files}
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
COMMAND ${CMAKE_COMMAND} -E make_directory ${DATAFILE_DIR}/protobuf
Add SparkplugB dissector Add a dissector for SparkplugB as a heuristic subdissector of MQTT and which calls protobuf to dissect the messages payload.
2021-04-10 18:15:34 +00:00
COMMAND ${CMAKE_COMMAND} -E copy_if_different
Adding more than one protobuff file fails.
2021-05-20 15:26:19 +00:00
${_protobuf_src_files}
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
${DATAFILE_DIR}/protobuf
Add SparkplugB dissector Add a dissector for SparkplugB as a heuristic subdissector of MQTT and which calls protobuf to dissect the messages payload.
2021-04-10 18:15:34 +00:00
VERBATIM
Move a bunch of protocol resources to resources/protocols. Move the following directories to resources/protocols: - dtds - diameter - protobuf - radius - tpncp - wimaxasncp
2022-03-11 00:01:14 +00:00
DEPENDS ${_protobuf_dep_files}
WORKING_DIRECTORY ${_protocol_data_dir}
Add SparkplugB dissector Add a dissector for SparkplugB as a heuristic subdissector of MQTT and which calls protobuf to dissect the messages payload.
2021-04-10 18:15:34 +00:00
)
Move some configuration and data files to resources/share. Create resources/share/wireshark and resources/share/logwolf. Move various data and configuration files to resources/share/wireshark and add resources/share/logwolf/colorfilters.
2022-04-25 16:04:55 +00:00
file(GLOB _profiles_src_files RELATIVE "${CMAKE_SOURCE_DIR}" resources/share/wireshark/profiles/*/*)
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
set (_profiles_data_files)
foreach(_data_file ${_profiles_src_files})
list(APPEND _profiles_data_files "${DATAFILE_DIR}/${_data_file}")
endforeach()
add_custom_command(
OUTPUT ${_profiles_data_files}
COMMAND ${CMAKE_COMMAND} -E copy_directory
Move some configuration and data files to resources/share. Create resources/share/wireshark and resources/share/logwolf. Move various data and configuration files to resources/share/wireshark and add resources/share/logwolf/colorfilters.
2022-04-25 16:04:55 +00:00
"${CMAKE_SOURCE_DIR}/resources/share/wireshark/profiles" "${DATAFILE_DIR}/profiles"
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
)
list(APPEND copy_data_files_depends
${_dtds_data_files}
${_diameter_data_files}
${_radius_data_files}
Add SparkplugB dissector Add a dissector for SparkplugB as a heuristic subdissector of MQTT and which calls protobuf to dissect the messages payload.
2021-04-10 18:15:34 +00:00
${_protobuf_data_files}
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
${_profiles_data_files}
)
cmake: fix dependencies for copy_data_files Ensure that files from INSTALL_FILES depend on html_docs, not the parent target copy_data_files (that would not help at all). Ensure that lua scripts are generated before copying them (another moved dependency). Explicitly track the help files that have to be textified for Windows (this finalizes the addition of proper dependencies to copy_data_files targets). Since there is no compelling reason for the extra copy_data_files_depends target now, remove it and move copy_data_files a bit further in the file such that the dependencies can be set. While at it, remove the unnecessary make_directory, the copy_data_files target will create it automatically when copying a file into it. Should fix the problem reported at https://code.wireshark.org/review/12028 Change-Id: I81e56c93ac0fc85e7385605b9c780a80b3d43c85 Reviewed-on: https://code.wireshark.org/review/12130 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-25 10:08:16 +00:00
# Copy files including ${INSTALL_FILES} and ${INSTALL_DIRS} to ${DATAFILE_DIR}
CMake: Copy multiple data files at a time. Copy the DTD, DIAMETER, RADIUS, and profile files all at once instead of individually. Change-Id: I7c75c4a784956b998a82fd627dd17843820096ff Reviewed-on: https://code.wireshark.org/review/25439 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-23 20:05:10 +00:00
add_custom_target(copy_data_files ALL DEPENDS ${copy_data_files_depends} )
cmake: fix dependencies for copy_data_files Ensure that files from INSTALL_FILES depend on html_docs, not the parent target copy_data_files (that would not help at all). Ensure that lua scripts are generated before copying them (another moved dependency). Explicitly track the help files that have to be textified for Windows (this finalizes the addition of proper dependencies to copy_data_files targets). Since there is no compelling reason for the extra copy_data_files_depends target now, remove it and move copy_data_files a bit further in the file such that the dependencies can be set. While at it, remove the unnecessary make_directory, the copy_data_files target will create it automatically when copying a file into it. Should fix the problem reported at https://code.wireshark.org/review/12028 Change-Id: I81e56c93ac0fc85e7385605b9c780a80b3d43c85 Reviewed-on: https://code.wireshark.org/review/12130 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-25 10:08:16 +00:00
set_target_properties(copy_data_files PROPERTIES FOLDER "Copy Tasks")
CMake: Copy data files to the run directory. Set DATAFILE_DIR to a value that includes the build configuration. Add a copy_data_files target that copies AUTHORS-SHORT, the default filters, and other support files to the run directory. Add FindPowerShell.cmake and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ declarations which are now covered by copy_data_files. Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 Reviewed-on: https://code.wireshark.org/review/6561 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 21:07:48 +00:00
CMake: use object libraries to avoid redundant builds Some source files are duplicated via add_executable. Assuming that these are not affected by target-specific preprocessor macros, they can be built only once and shared among executables. In one configuration, this reduces the number of object files by 55 (cli_main.c and version_info.c alone were built 15 times each). Removes the version dependency from each target since the 'version_info' target can now declare this dependency. Remove CLEAN_C_FILES from extcap since it is not used to set -Werror. Due to removing some files from wireshark_FILES (and others), these are no longer part of checkAPIs though. Hopefully that is acceptable. Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58 Reviewed-on: https://code.wireshark.org/review/31509 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-12 11:43:18 +00:00
# sources common for wireshark, tshark, rawshark and sharkd
add_library(shark_common OBJECT
cfile.c
extcap.c
extcap_parser.c
file_packet_provider.c
frame_tvbuff.c
sync_pipe_write.c
)
add_library(cli_main OBJECT cli_main.c)
add_library(capture_opts OBJECT capture_opts.c)
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
target_include_directories(capture_opts SYSTEM PRIVATE ${PCAP_INCLUDE_DIRS})
Move version_info.[ch] to ui/ Version info is an aspect of UI implementation so move it to a more appropriate place, such as ui/. This also helps declutter the top-level. A static library is appropriate to encapsulate the dependencies as private and it is better supported by CMake than object libraries. Also version_info.h should not be installed as a public header.
2021-07-03 11:58:30 +00:00
set_target_properties(shark_common cli_main capture_opts
CMake: use object libraries to avoid redundant builds Some source files are duplicated via add_executable. Assuming that these are not affected by target-specific preprocessor macros, they can be built only once and shared among executables. In one configuration, this reduces the number of object files by 55 (cli_main.c and version_info.c alone were built 15 times each). Removes the version dependency from each target since the 'version_info' target can now declare this dependency. Remove CLEAN_C_FILES from extcap since it is not used to set -Werror. Due to removing some files from wireshark_FILES (and others), these are no longer part of checkAPIs though. Hopefully that is acceptable. Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58 Reviewed-on: https://code.wireshark.org/review/31509 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-12 11:43:18 +00:00
PROPERTIES
COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
)
GTK Cmake: Remove the option to build the GTK UI. Change-Id: If702717b559a727388d83ce82c0fc2967c662ff0 Reviewed-on: https://code.wireshark.org/review/26747 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-05 06:59:12 +00:00
if(BUILD_wireshark AND QT_FOUND)
Distinguish between wireshark *source files* and wireshark *dependencies*. Only the former should be run through checkAPI.pl; Windows .rc files, for example, shouldn't. Change-Id: I948705b4020b413834c37a0d685eedcb747aa237 Reviewed-on: https://code.wireshark.org/review/3303 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31 21:17:07 +00:00
set(WIRESHARK_SRC
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
file.c
fileset.c
Now the GUI programs (wireshark/gtk2 and qtshark) compile and link svn path=/trunk/; revision=52538
2013-10-11 10:32:11 +00:00
${PLATFORM_UI_SRC}
Distinguish between wireshark *source files* and wireshark *dependencies*. Only the former should be run through checkAPI.pl; Windows .rc files, for example, shouldn't. Change-Id: I948705b4020b413834c37a0d685eedcb747aa237 Reviewed-on: https://code.wireshark.org/review/3303 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31 21:17:07 +00:00
)
set(wireshark_FILES
CMake: use object libraries to avoid redundant builds Some source files are duplicated via add_executable. Assuming that these are not affected by target-specific preprocessor macros, they can be built only once and shared among executables. In one configuration, this reduces the number of object files by 55 (cli_main.c and version_info.c alone were built 15 times each). Removes the version dependency from each target since the 'version_info' target can now declare this dependency. Remove CLEAN_C_FILES from extcap since it is not used to set -Werror. Due to removing some files from wireshark_FILES (and others), these are no longer part of checkAPIs though. Hopefully that is acceptable. Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58 Reviewed-on: https://code.wireshark.org/review/31509 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-12 11:43:18 +00:00
$<TARGET_OBJECTS:capture_opts>
CMake: change static qtui library into an object library Save 800ms and avoids a synchronization point (improves build parallelism) by directly adding object files to the wireshark binary. Change-Id: I7d1484c65a26f3f6874474b61d38ba474aba8347 Reviewed-on: https://code.wireshark.org/review/31512 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-12 15:33:39 +00:00
$<TARGET_OBJECTS:qtui>
CMake: use object libraries to avoid redundant builds Some source files are duplicated via add_executable. Assuming that these are not affected by target-specific preprocessor macros, they can be built only once and shared among executables. In one configuration, this reduces the number of object files by 55 (cli_main.c and version_info.c alone were built 15 times each). Removes the version dependency from each target since the 'version_info' target can now declare this dependency. Remove CLEAN_C_FILES from extcap since it is not used to set -Werror. Due to removing some files from wireshark_FILES (and others), these are no longer part of checkAPIs though. Hopefully that is acceptable. Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58 Reviewed-on: https://code.wireshark.org/review/31509 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-12 11:43:18 +00:00
$<TARGET_OBJECTS:shark_common>
Distinguish between wireshark *source files* and wireshark *dependencies*. Only the former should be run through checkAPI.pl; Windows .rc files, for example, shouldn't. Change-Id: I948705b4020b413834c37a0d685eedcb747aa237 Reviewed-on: https://code.wireshark.org/review/3303 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-31 21:17:07 +00:00
${WIRESHARK_SRC}
Don't run checkapi on .rc files. Change-Id: I75879bfcd0d9706523447146b16c319d3eb56d23 Reviewed-on: https://code.wireshark.org/review/6361 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-07 10:17:14 +00:00
${PLATFORM_UI_RC_FILES}
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
)
Windows: Make our program details more consistent. Use a single template file for most of our program resources. Encode our resource files as UTF-8. Add resources to extcap/*.exe. Replace a regex with concatenation. Change-Id: I0ed49086618127ca4fdef69272f849d8f16e4dab Reviewed-on: https://code.wireshark.org/review/30088 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-08 23:34:39 +00:00
set_executable_resources(wireshark "Wireshark" UNIQUE_RC)
Prepare the cmake infrastucture for eventually building wireshark and qtshark simultanously. The "only" missing thing for this is now ui/qt/CMakeLists.txt ;) svn path=/trunk/; revision=40799
2012-02-02 00:46:02 +00:00
endif()
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
if(BUILD_logray AND QT_FOUND)
set(LOGRAY_SRC
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
file.c
fileset.c
${PLATFORM_UI_SRC}
)
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
set(logray_FILES
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
$<TARGET_OBJECTS:capture_opts>
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
$<TARGET_OBJECTS:ui_logray>
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
$<TARGET_OBJECTS:shark_common>
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
${LOGRAY_SRC}
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
${PLATFORM_UI_RC_FILES}
)
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
set_executable_resources(logray "Logray" UNIQUE_RC)
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
endif()
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
if(ENABLE_APPLICATION_BUNDLE)
OS X: Integrate CMake and osx-app.sh Add a -cb/--create-bundle option to osx-app.sh which builds the application bundle. Use it in Autotools. (CMake does this by default.) Copy over linker flags from configure.ac to CMakeLists.txt to support rpathification and code signing. Add an osx-app custom target to CMake. Change-Id: I6c20a1c27f8954aaea62904b7425b9312d994803 Reviewed-on: https://code.wireshark.org/review/4918 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-23 15:41:39 +00:00
#
# Add -Wl,-single_module to the LDFLAGS used with shared
# libraries, to fix some error that show up in some cases;
# some Apple documentation recommends it for most shared
# libraries.
#
set( CMAKE_SHARED_LINKER_FLAGS "-Wl,-single_module ${CMAKE_SHARED_LINKER_FLAGS}" )
#
# Add -Wl,-headerpad_max_install_names to the LDFLAGS, as
# code-signing issues is running out of padding space.
#
# Add -Wl,-search_paths_first to make sure that if we search
# directories A and B, in that order, for a given library, a
# non-shared version in directory A, rather than a shared
# version in directory B, is chosen (so we can use
# --with-pcap=/usr/local to force all programs to be linked
# with a static version installed in /usr/local/lib rather than
# the system version in /usr/lib).
#
set(CMAKE_EXE_LINKER_FLAGS
Don't add rpaths with CMake, either; osx-app.sh will do so. Change-Id: Ie8f39e5e89ed8dc21c66ee7f1235c406c3028304 Reviewed-on: https://code.wireshark.org/review/9613 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-13 02:54:15 +00:00
"-Wl,-headerpad_max_install_names -Wl,-search_paths_first ${CMAKE_EXE_LINKER_FLAGS}"
OS X: Integrate CMake and osx-app.sh Add a -cb/--create-bundle option to osx-app.sh which builds the application bundle. Use it in Autotools. (CMake does this by default.) Copy over linker flags from configure.ac to CMakeLists.txt to support rpathification and code signing. Add an osx-app custom target to CMake. Change-Id: I6c20a1c27f8954aaea62904b7425b9312d994803 Reviewed-on: https://code.wireshark.org/review/4918 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-23 15:41:39 +00:00
)
# Add files to the app bundle
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
# Wireshark.app/Contents
CMake: Build a complete application bundle on OS X. Run osx-app.sh by default on OS X. Aside from giving us a fully portable application bundle after building this should let us clear our library path at startup should the need arise. Change the name of the osx-app target to app_bundle. Search ../Frameworks before ../lib. Create PkgInfo at configure time instead of compile time. Build our program list as we go. Change-Id: If5511ee921108b1c079cef67026eac9e47211be1 Reviewed-on: https://code.wireshark.org/review/6896 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-01 21:56:39 +00:00
file(WRITE ${CMAKE_BINARY_DIR}/packaging/macosx/PkgInfo "APPLWshk\n")
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
set(BUNDLE_CONTENTS_FILES
${CMAKE_BINARY_DIR}/packaging/macosx/PkgInfo
)
set_source_files_properties(${BUNDLE_CONTENTS_FILES} PROPERTIES
MACOSX_PACKAGE_LOCATION .
)
# Wireshark.app/Contents/Resources
set(BUNDLE_RESOURCE_FILES
OS X: Remove GTK+ packaging. Remove the GTK+-specific bits from packaging/macosx. Change-Id: I8f7d909f971e60723e421005fdf46de967c69533 Reviewed-on: https://code.wireshark.org/review/14431 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-03-11 21:45:54 +00:00
${CMAKE_SOURCE_DIR}/packaging/macosx/Wireshark.icns
${CMAKE_SOURCE_DIR}/packaging/macosx/Wiresharkdoc.icns
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
)
set_source_files_properties(${BUNDLE_RESOURCE_FILES} PROPERTIES
MACOSX_PACKAGE_LOCATION Resources
)
CMake: Bundle the "share" directory files and directories. Work around a CMake bug using file globbing. Change-Id: I67dc8268154e05834e5d4e7d8f22c6eb25b24c1f Reviewed-on: https://code.wireshark.org/review/4595 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10 15:32:51 +00:00
# Wireshark.app/Contents/Resources/share/man/man1
set_source_files_properties(${BUNDLE_RESOURCE_SHARE_MAN1_FILES} PROPERTIES
MACOSX_PACKAGE_LOCATION Resources/share/man/man1
CMakeLists: Add man files Current Wireshark.app bundle on OS X doesn't include man pages. This is the second try after commit 7da23ca1a5bba4af5e1104f4d3d3d44e918552b0 has been reverted. Now cmake gets the information that the man files are generated. Bug: 12746 Change-Id: I34dfec65bd57587ee048d7e1e2557fc9ab2b32eb Reviewed-on: https://code.wireshark.org/review/18170 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-12 19:55:54 +00:00
GENERATED 1
CMake: Bundle the "share" directory files and directories. Work around a CMake bug using file globbing. Change-Id: I67dc8268154e05834e5d4e7d8f22c6eb25b24c1f Reviewed-on: https://code.wireshark.org/review/4595 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10 15:32:51 +00:00
)
CMAkelists: fix typo on comment Change-Id: I572ebbbae9ac91e2d566a39d0dae462bc40bcac8 Reviewed-on: https://code.wireshark.org/review/18522 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-27 15:54:41 +00:00
# Wireshark.app/Contents/Resources/share/man/man4
CMake: Bundle the "share" directory files and directories. Work around a CMake bug using file globbing. Change-Id: I67dc8268154e05834e5d4e7d8f22c6eb25b24c1f Reviewed-on: https://code.wireshark.org/review/4595 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10 15:32:51 +00:00
set_source_files_properties(${BUNDLE_RESOURCE_SHARE_MAN4_FILES} PROPERTIES
MACOSX_PACKAGE_LOCATION Resources/share/man/man4
CMakeLists: Add man files Current Wireshark.app bundle on OS X doesn't include man pages. This is the second try after commit 7da23ca1a5bba4af5e1104f4d3d3d44e918552b0 has been reverted. Now cmake gets the information that the man files are generated. Bug: 12746 Change-Id: I34dfec65bd57587ee048d7e1e2557fc9ab2b32eb Reviewed-on: https://code.wireshark.org/review/18170 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-12 19:55:54 +00:00
GENERATED 1
CMake: Bundle the "share" directory files and directories. Work around a CMake bug using file globbing. Change-Id: I67dc8268154e05834e5d4e7d8f22c6eb25b24c1f Reviewed-on: https://code.wireshark.org/review/4595 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10 15:32:51 +00:00
)
CMake: Copy data files to the run directory. Set DATAFILE_DIR to a value that includes the build configuration. Add a copy_data_files target that copies AUTHORS-SHORT, the default filters, and other support files to the run directory. Add FindPowerShell.cmake and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ declarations which are now covered by copy_data_files. Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 Reviewed-on: https://code.wireshark.org/review/6561 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 21:07:48 +00:00
# INSTALL_FILES and INSTALL_DIRS are handled by copy_data_files
CMake: Bundle the "share" directory files and directories. Work around a CMake bug using file globbing. Change-Id: I67dc8268154e05834e5d4e7d8f22c6eb25b24c1f Reviewed-on: https://code.wireshark.org/review/4595 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-10 15:32:51 +00:00
set(EXTRA_BUNDLE_FILES
${BUNDLE_CONTENTS_FILES}
${BUNDLE_RESOURCE_FILES}
${BUNDLE_RESOURCE_SHARE_MAN1_FILES}
${BUNDLE_RESOURCE_SHARE_MAN4_FILES}
)
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
else()
set(EXTRA_BUNDLE_FILES)
endif()
Qt → wireshark. GTK+ → wireshark-gtk. Make sure the Qt UI is named "Wireshark" and its executable is named "wireshark" or "wireshark.exe". Make sure the GTK+ UI is named "Wireshark 1" or "Wireshark (GTK+)" depending on how much the target audience is likely to care about UI toolkits. Make sure the GTK+ executable is named "wireshark-gtk" or "wireshark-gtk.exe". It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps package. It's likely even more broken now. Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake 1.11.3) at some point. The first attempt to compile in ui/qt returns "error: source_file.cpp: No such file or directory". The second attempt works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1). Tested: - Nmake builds - NSIS packaging - CMake builds (Windows, OS X) - Autotools build and distcheck - RPM packaging To do: - Test Debian packaging - Fix PortableApps Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2 Reviewed-on: https://code.wireshark.org/review/3919 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-28 23:48:53 +00:00
if(BUILD_wireshark AND QT_FOUND)
set(wireshark_LIBS
Update CMakeLists to respect the recent libui changes so that wireshark and qtshark build again. (Also, first commit trying to use bzr as an svn client, so apologies if something unexpected breaks) svn path=/trunk/; revision=44908
2012-09-15 02:52:29 +00:00
ui
Move the routines to talk to dumpcap into a static libcapchild. This pulls some stuff out of the top-level directory, and means we don't have to build them once for every program using them. Change-Id: I37b31fed20f2d5c3563ecd2bae9fd86af70afff5 Reviewed-on: https://code.wireshark.org/review/2591 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-23 23:48:41 +00:00
capchild
Move utility routines for capturing into a libcaputils static library. Some of those routines are used only in dumpcap; others are used in TShark and Wireshark as well. Change-Id: I9d92483f2fcff57a7d8b6bf6bdf2870505d19fb7 Reviewed-on: https://code.wireshark.org/review/2841 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-04 07:24:02 +00:00
caputils
CMake: Modernize config-file package support A CMake config-file package provides support for downstreams using CMake and Wireshark libraries to easily configure the libwireshark dependency with: find_package(Wireshark CONFIG [REQUIRED]) target_link_libraries(foo epan) The FindWireshark.cmake file is no longer needed. See cmake-package(7) for more details on CMake's package system. Change-Id: Ie8af1d44417a99dd08d37959f7b2ffca88572ec2 Reviewed-on: https://code.wireshark.org/review/29208 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-23 21:03:28 +00:00
wiretap
CMake: Fix some transitive link dependencies libwireshark and libwiretap have their INTERFACE link dependencies changed to the required set. libwsutil keeps a default public visibility. Further work may show some unneeded link requirements. The executable dependencies are adjusted accordingly. Change-Id: I3a534f72403819cac136ae47a3d80acee76e0fb3 Reviewed-on: https://code.wireshark.org/review/30815 Reviewed-by: João Valverde <j@v6e.pt>
2018-11-27 19:37:33 +00:00
epan
Move version_info.[ch] to ui/ Version info is an aspect of UI implementation so move it to a more appropriate place, such as ui/. This also helps declutter the top-level. A static library is appropriate to encapsulate the dependencies as private and it is better supported by CMake than object libraries. Also version_info.h should not be installed as a public header.
2021-07-03 11:58:30 +00:00
version_info
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
${QT_LIBRARIES}
We don't need Cocoa or Core Services for anything. What we *do* need is: the Application Services framework, for GUI applications; System Configuration, for anything that would try to get interface friendly names; Core Foundation for everything that uses either of those and/or everything that displays system version information. We're currently assuming that the only Apple platform on which we build is OS X, in which case we have the OS X frameworks; update a comment. cfutils.c is part of WIRESHARK_COMMON_SRC, which is included in tshark_FILES; it doesn't need to be included in tshark_FILES. svn path=/trunk/; revision=46147
2012-11-22 18:19:37 +00:00
${APPLE_APPLICATION_SERVICES_LIBRARY}
Qt: Fix MacOSX menu entries Remove various menu items added automatically on Mac OS X. The following menu items have been removed: - Edit / Start Dictation - Edit / Emoji & Symbols - View / Enter Fullscreen Mode - View / Show Tab Bar - Hide Tab Bar Bug: 13366 Change-Id: I44deae7ee8ea7a43926820e4f5d0517ece246939 Reviewed-on: https://code.wireshark.org/review/26823 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-09 09:39:49 +00:00
${APPLE_APPKIT_LIBRARY}
Link with CoreFoundation and SystemConfiguration and add cfuitils.c on OS X where needed. Dumpcap, rawshark and tshark don't appear to require Cocoa so remove it. svn path=/trunk/; revision=46144
2012-11-22 16:49:17 +00:00
${APPLE_CORE_FOUNDATION_LIBRARY}
${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
CMake: Work correctly without Sparkle. Set or clear SPARKLE_LIBRARIES and SPARKLE_INCLUDE_DIRS in FindSparkle.cmake, similar to what we do in other modules. Use them instead of SPARKLE_LIBRARY and SPARKLE_INCLUDE_DIR. Change-Id: I023c711edd6a44421aadf85413da3207d9b08e64 Reviewed-on: https://code.wireshark.org/review/35097 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-15 21:30:19 +00:00
${SPARKLE_LIBRARIES}
Windows: Modernize our WSAStartup usage. Make sure we link each application that calls WSAStartup with ws2_32.lib. Pass version 2.2 to WSAStartup. Wikipedia says it was introduced in 1996, so we should be OK. Ping-Bug: 15711 Change-Id: I431839e930e7c646669af7373789640b5180ec28 Reviewed-on: https://code.wireshark.org/review/33033 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Tomasz Moń <desowin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-04-30 22:48:06 +00:00
${WIN_WS2_32_LIBRARY}
Qt: Warn the user about DBAR 1.8 on Windows. At startup, dig through the registry looking for shell extensions. If any of them match known Dell Backup and Recovery DLL names and the DLL version matches 1.8.*.*, show the user a warning dialog. This is a bit extreme but I'm not sure what else to do. Dell is a popular computer manufacturer and bug reports keep trickling in. Change-Id: I6d1bd6c56850279356570154d231b07facb30cff Bug: 12036 Ping-bug: 12701 Ping-bug: 13414 Reviewed-on: https://code.wireshark.org/review/16861 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-08-03 19:14:23 +00:00
${WIN_VERSION_LIBRARY}
CMake: Fix some transitive link dependencies libwireshark and libwiretap have their INTERFACE link dependencies changed to the required set. libwsutil keeps a default public visibility. Further work may show some unneeded link requirements. The executable dependencies are adjusted accordingly. Change-Id: I3a534f72403819cac136ae47a3d80acee76e0fb3 Reviewed-on: https://code.wireshark.org/review/30815 Reviewed-by: João Valverde <j@v6e.pt>
2018-11-27 19:37:33 +00:00
${WINSPARKLE_LIBRARIES}
CMake: change static qtui library into an object library Save 800ms and avoids a synchronization point (improves build parallelism) by directly adding object files to the wireshark binary. Change-Id: I7d1484c65a26f3f6874474b61d38ba474aba8347 Reviewed-on: https://code.wireshark.org/review/31512 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-12 15:33:39 +00:00
$<$<BOOL:${WIN32}>:UxTheme.lib>
CMake: Check for and use system SpeexDSP library Change-Id: I8443379d23a2946dd21c12e5e0bd5464ab73ca25 Reviewed-on: https://code.wireshark.org/review/31857 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-02-02 14:52:07 +00:00
${SPEEXDSP_LIBRARIES}
Qt: Import Profile information Allow easy import of profiles. Profiles must be stored inside a zip file, with no additional hierarchy. Change-Id: I0ae77460c20ef6b3e447906e671b0cefa6b9b032 Reviewed-on: https://code.wireshark.org/review/33881 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2019-07-10 22:25:45 +00:00
${MINIZIP_LIBRARIES}
Prepare the cmake infrastucture for eventually building wireshark and qtshark simultanously. The "only" missing thing for this is now ui/qt/CMakeLists.txt ;) svn path=/trunk/; revision=40799
2012-02-02 00:46:02 +00:00
)
Qt: Move wireshark-qt.cpp back to ui/qt/main.cpp. The Qt UI's main module started out as ui/qt/main.cpp but was moved to the top-level directory in order to appease Autotools. We don't need to do that any more, so move it back. Change-Id: Ic5bc0ed5b754e36cc2b9e682f2ca097781233dfd Reviewed-on: https://code.wireshark.org/review/28090 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-07 20:04:38 +00:00
add_executable(wireshark WIN32 MACOSX_BUNDLE ${wireshark_FILES} ${EXTRA_BUNDLE_FILES})
CMake: Set wireshark as Visual Studio startup project Default startup project to wireshark instead of ALL_BUILD. Change-Id: I4694660eba95cd05012f09aa062d923e6c7500d8 Reviewed-on: https://code.wireshark.org/review/34513 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-09-12 14:21:16 +00:00
if(WIN32)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT wireshark)
endif()
CMake: Build a complete application bundle on OS X. Run osx-app.sh by default on OS X. Aside from giving us a fully portable application bundle after building this should let us clear our library path at startup should the need arise. Change the name of the osx-app target to app_bundle. Search ../Frameworks before ../lib. Create PkgInfo at configure time instead of compile time. Build our program list as we go. Change-Id: If5511ee921108b1c079cef67026eac9e47211be1 Reviewed-on: https://code.wireshark.org/review/6896 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-01 21:56:39 +00:00
set(PROGLIST ${PROGLIST} wireshark)
CMake: Allow user build flags to override default build flags Autotools has the very useful feature by design of allowing the user to override the default build flags (you break it you keep it). Apparently CMake applies COMPILE_OPTIONS target property after CMAKE_{C,CXX}_FLAGS so that doesn't work here. Prepend our flags to those variables instead to make it work then. Specific target flag overrides can still be added with COMPILER_OPTIONS (e.g: generated files with -Wno-warning) but this is less effective and then we're back at the point where this overrides user flags. It's less of a concern though. Change-Id: I44761a79be4289238e02d4e781fef0099628817b Reviewed-on: https://code.wireshark.org/review/23675 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-09-24 01:30:08 +00:00
set_target_properties(wireshark PROPERTIES
Revert "Use CMAKE_EXE_LINKER_FLAGS to set link flags on executables." This reverts commit 84447550efdad68acfc69281750ed016f7f96716. Reason for revert: CMake's documentation for the flags variables is close to content-free, giving no indication what the link flags used in the link will be, given a combination of various CMAKE.*LINKER_FLAGS variables and LINK_FLAGS properties. That makes it extremely difficult to determine why this change happens to cause some executables to be linked with "/INCREMENTAL" and others to be linked with "/INCREMENTAL:YES", even though we add "/INCREMENTAL:NO" to WS_LINK_FLAGS and add WS_LINK_FLAGS to CMAKE_EXE_LINKER_FLAGS - or why *not* setting CMAKE_EXE_LINKER_FLAGS and instead using LINK_FLAGS *doesn't* cause that to happen. Maybe it's an issue of CMAKE_EXE_LINKER_FLAGS vs. CMAKE_EXE_LINKER_FLAGS_<CONFIG>, but the documentation doesn't clearly indicate whether, for example, the link flags for a particular executable target are a combination of CMAKE_EXE_LINKER_FLAGS, the CMAKE_EXE_LINKER_FLAGS_<CONFIG> flag for the configuration of this build, and the LINK_FLAGS property of the target, if any. That's the most *obvious* behavior to implement, but if that's the behavior that's implemented, I'm not sure why the change being reverted had the effect it did. Change-Id: I6a73fe88be65378d506a89460f7362076233f319 Reviewed-on: https://code.wireshark.org/review/30023 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot
2018-10-04 18:09:14 +00:00
LINK_FLAGS "${WS_LINK_FLAGS}"
CMake: Allow user build flags to override default build flags Autotools has the very useful feature by design of allowing the user to override the default build flags (you break it you keep it). Apparently CMake applies COMPILE_OPTIONS target property after CMAKE_{C,CXX}_FLAGS so that doesn't work here. Prepend our flags to those variables instead to make it work then. Specific target flag overrides can still be added with COMPILER_OPTIONS (e.g: generated files with -Wno-warning) but this is less effective and then we're back at the point where this overrides user flags. It's less of a concern though. Change-Id: I44761a79be4289238e02d4e781fef0099628817b Reviewed-on: https://code.wireshark.org/review/23675 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-09-24 01:30:08 +00:00
FOLDER "Executables"
CMake: Set a direct rpath for libraries Instead of using "$ORIGIN/../lib" just use "$ORIGIN". Also be explicit in configuring the relative RPATH. We don't want to assume a default relative path, in case more targets are addded, out of caution. Change-Id: I3b7f5e8de7be8bb30aca3b433212113d876c4163 Reviewed-on: https://code.wireshark.org/review/31647 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-21 10:56:57 +00:00
INSTALL_RPATH "${EXECUTABLE_INSTALL_RPATH}"
CMake: Set Qt autogen properties for Wireshark. It looks like multi-configuration generators (notably MSBuild) need Qt autogen properties set on the wireshark target as well as qtui. Do so unconditionally in both cases. (We were doing so conditionally for qtui before.)
2021-05-14 00:53:40 +00:00
AUTOMOC ON
AUTOUIC ON
AUTORCC ON
CMake: Allow user build flags to override default build flags Autotools has the very useful feature by design of allowing the user to override the default build flags (you break it you keep it). Apparently CMake applies COMPILE_OPTIONS target property after CMAKE_{C,CXX}_FLAGS so that doesn't work here. Prepend our flags to those variables instead to make it work then. Specific target flag overrides can still be added with COMPILER_OPTIONS (e.g: generated files with -Wno-warning) but this is less effective and then we're back at the point where this overrides user flags. It's less of a concern though. Change-Id: I44761a79be4289238e02d4e781fef0099628817b Reviewed-on: https://code.wireshark.org/review/23675 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-09-24 01:30:08 +00:00
)
CMake: Add ENABLE_VLD option for MSVC Calling cmake with -DENABLE_VLD=ON when building with Visual Studio, results in debug configuration being linked to Visual Leak Detector. By default, Visual Leak Detector outputs the leak summary to Visual Studio debug window. When ENABLE_VLD is active, VLD is linked to all wireshark libraries and executables.
2021-03-29 10:10:16 +00:00
if(MSVC)
set_target_properties(wireshark PROPERTIES LINK_FLAGS_DEBUG "${WS_MSVC_DEBUG_LINK_FLAGS}")
endif()
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
if(ENABLE_APPLICATION_BUNDLE OR WIN32)
set_target_properties(wireshark PROPERTIES OUTPUT_NAME Wireshark)
endif()
CMake: Build a complete application bundle on OS X. Run osx-app.sh by default on OS X. Aside from giving us a fully portable application bundle after building this should let us clear our library path at startup should the need arise. Change the name of the osx-app target to app_bundle. Search ../Frameworks before ../lib. Create PkgInfo at configure time instead of compile time. Build our program list as we go. Change-Id: If5511ee921108b1c079cef67026eac9e47211be1 Reviewed-on: https://code.wireshark.org/review/6896 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-01 21:56:39 +00:00
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
if(ENABLE_APPLICATION_BUNDLE)
CMake: fix macOS build without Asciidoctor Fix an error when running cmake on macOS without Asciidoctor: The dependency target "manpages" of target "wireshark" does not exist. Fixes: 44bd3a7d7923 ("CMake+Docs: Update our man page targets.")
2021-11-03 14:23:10 +00:00
if(ASCIIDOCTOR_FOUND)
# Make sure to generate files referenced by
# BUNDLE_RESOURCE_SHARE_MAN1_FILES
add_dependencies(wireshark manpages)
endif()
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
set_target_properties(
wireshark PROPERTIES
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_BINARY_DIR}/packaging/macosx/WiresharkInfo.plist
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
)
Fix build paths for cmake's Xcode project generator on macOS. Multi-configuration generators (such as Xcode or VS) append the current build configuration to most paths (eg. Debug/Release). Currently this results in inconsistent paths for the application bundle and the included command line tools. This commit sets the correct path information for multi-configuration generators for macOS application bundles. The standard Makefile behaviour is untouched. One Windows specific configuration was changed, as it was conflicting with these changes. This needs to be checked before merging. Additionally the wrapper scripts are omitted for Xcode, as the path to the binaries depends on the configuration chosen in Xcode. Therefore it is not viable to create these scripts in the cmake run. Bug: 11816 Change-Id: Ib43d82eb04600a0e2f2b020afb44b579ffc7a7c9 Reviewed-on: https://code.wireshark.org/review/28291 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-15 10:44:47 +00:00
if(CMAKE_CFG_INTDIR STREQUAL ".")
# Add a wrapper script which opens the bundle. This adds
# convenience but makes debugging more difficult.
# It is not created if using Xcode
CMake+macOS: Use symlinks for our CLI utilities. On macOS, <build directory>/run/wireshark is a wrapper script that execs run/Wireshark.app/Contents/MacOS/Wireshark so that Launch Services will activate our application properly. We don't need to worry about this for our other executables. Make them symlinks so that we can run things like `lldb run/tshark` with impunity. Change-Id: I4e656d778040ece722f873b1a7f6e6e60d21e2a6 Reviewed-on: https://code.wireshark.org/review/33071 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-05-03 19:20:47 +00:00
# XXX Running run/Wireshark.app/Contents/MacOS/Wireshark works
# fine for me (Gerald) here on Mojave. Can we just make this a
# symlink?
Fix build paths for cmake's Xcode project generator on macOS. Multi-configuration generators (such as Xcode or VS) append the current build configuration to most paths (eg. Debug/Release). Currently this results in inconsistent paths for the application bundle and the included command line tools. This commit sets the correct path information for multi-configuration generators for macOS application bundles. The standard Makefile behaviour is untouched. One Windows specific configuration was changed, as it was conflicting with these changes. This needs to be checked before merging. Additionally the wrapper scripts are omitted for Xcode, as the path to the binaries depends on the configuration chosen in Xcode. Therefore it is not viable to create these scripts in the cmake run. Bug: 11816 Change-Id: Ib43d82eb04600a0e2f2b020afb44b579ffc7a7c9 Reviewed-on: https://code.wireshark.org/review/28291 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-15 10:44:47 +00:00
file(REMOVE ${CMAKE_BINARY_DIR}/run/wireshark)
file(WRITE ${CMAKE_BINARY_DIR}/run/wireshark "#!/bin/sh\n")
file(APPEND ${CMAKE_BINARY_DIR}/run/wireshark "# Generated by ${CMAKE_CURRENT_LIST_FILE}\n")
CMake+macOS: Use symlinks for our CLI utilities. On macOS, <build directory>/run/wireshark is a wrapper script that execs run/Wireshark.app/Contents/MacOS/Wireshark so that Launch Services will activate our application properly. We don't need to worry about this for our other executables. Make them symlinks so that we can run things like `lldb run/tshark` with impunity. Change-Id: I4e656d778040ece722f873b1a7f6e6e60d21e2a6 Reviewed-on: https://code.wireshark.org/review/33071 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-05-03 19:20:47 +00:00
file(APPEND ${CMAKE_BINARY_DIR}/run/wireshark "# Wrapper script which should work around the issue described at\n")
file(APPEND ${CMAKE_BINARY_DIR}/run/wireshark "# https://stackoverflow.com/questions/25318524/what-exactly-should-i-pass-to-nsapp-activateignoringotherapps-to-get-my-appl\n")
Fix build paths for cmake's Xcode project generator on macOS. Multi-configuration generators (such as Xcode or VS) append the current build configuration to most paths (eg. Debug/Release). Currently this results in inconsistent paths for the application bundle and the included command line tools. This commit sets the correct path information for multi-configuration generators for macOS application bundles. The standard Makefile behaviour is untouched. One Windows specific configuration was changed, as it was conflicting with these changes. This needs to be checked before merging. Additionally the wrapper scripts are omitted for Xcode, as the path to the binaries depends on the configuration chosen in Xcode. Therefore it is not viable to create these scripts in the cmake run. Bug: 11816 Change-Id: Ib43d82eb04600a0e2f2b020afb44b579ffc7a7c9 Reviewed-on: https://code.wireshark.org/review/28291 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-15 10:44:47 +00:00
file(APPEND ${CMAKE_BINARY_DIR}/run/wireshark "exec ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/MacOS/Wireshark \"\$\@\"\n")
execute_process(COMMAND chmod a+x ${CMAKE_BINARY_DIR}/run/wireshark)
endif()
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
endif()
Revert "On OS X, add the Qt -Wl,-rpath hack in CMake, as we do with autotools." This reverts commit 4a39706272a59d43530e038f8b20436e2c3052ce. At least in one quick check, CMake 2.8.12.2 added that already with Qt 5.5.0. Change-Id: Iabf0e4aa0aa34b380f981f7d039fb3d95847041e Reviewed-on: https://code.wireshark.org/review/9654 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-15 23:46:51 +00:00
target_link_libraries(wireshark ${wireshark_LIBS})
CMake: Work correctly without Sparkle. Set or clear SPARKLE_LIBRARIES and SPARKLE_INCLUDE_DIRS in FindSparkle.cmake, similar to what we do in other modules. Use them instead of SPARKLE_LIBRARY and SPARKLE_INCLUDE_DIR. Change-Id: I023c711edd6a44421aadf85413da3207d9b08e64 Reviewed-on: https://code.wireshark.org/review/35097 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-11-15 21:30:19 +00:00
target_include_directories(wireshark SYSTEM PRIVATE ${SPARKLE_INCLUDE_DIRS})
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
install(
TARGETS wireshark
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
)
Qt: Add the "Map" button to the Endpoints dialog. Move the map creation code from ui/gtk/hostlist_table.c to ui/traffic_table_ui.c. Add CMake commands to copy ipmap.html to the run directory so that WIRESHARK_RUN_FROM_BUILD_DIRECTORY works for the endpoint map. Not sure if they're entirely correct but they appear to work. Add boundary checkes to geoip_db_lookup_ipv[46]. To do: - It looks like there are prettier maps and newer APIs that we might want to use. Change-Id: Ie06992c9bc9c9aa683328aecab3f5f69c9cab966 Reviewed-on: https://code.wireshark.org/review/4011 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-05 18:17:17 +00:00
CMake+macOS: Make sure we're using the right Qt tools. Qt5CoreConfigExtras.cmake sets Qt5::qmake. Use it to find the corresponding path to macdeployqt and use those in osx-app.sh. Change-Id: I2e67f0126e272fc95d40476b9bfc83ab38d73cee Reviewed-on: https://code.wireshark.org/review/28359 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-20 22:59:41 +00:00
if(QT_WINDEPLOYQT_EXECUTABLE)
add_custom_target(copy_qt_dlls ALL)
set_target_properties(copy_qt_dlls PROPERTIES FOLDER "Copy Tasks")
# Will we ever need to use --debug? Windeployqt seems to
# be smart enough to copy debug DLLs when needed.
add_custom_command(TARGET copy_qt_dlls
POST_BUILD
COMMAND set "PATH=${QT_BIN_PATH};%PATH%"
COMMAND "${QT_WINDEPLOYQT_EXECUTABLE}"
--no-compiler-runtime
CMake+GitLab CI: Reduce verbosity. For various commands, make sure we show warnings and errors, but not other extraneous information such as filenames.
2021-12-11 21:57:29 +00:00
--verbose 0
MinGW-w64: Fix windeployqt errors --debug and --release flags are unnecessary and trigger errors. --pdb not supported and triggers a warning.
2021-07-15 00:37:23 +00:00
$<$<BOOL:${MSVC}>:--pdb>
CMake+macOS: Make sure we're using the right Qt tools. Qt5CoreConfigExtras.cmake sets Qt5::qmake. Use it to find the corresponding path to macdeployqt and use those in osx-app.sh. Change-Id: I2e67f0126e272fc95d40476b9bfc83ab38d73cee Reviewed-on: https://code.wireshark.org/review/28359 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-20 22:59:41 +00:00
"$<TARGET_FILE:wireshark>"
CMake: Rename the windeployqt variable. The windeployqt variable name ends up in the cache. Change it to QT_WINDEPLOYQT_EXECUTABLE, which follows conventions used in the Qt CMake modules. Change-Id: I14998b921009e44e5ca743e2915fe84447b22df0 Reviewed-on: https://code.wireshark.org/review/6549 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-15 16:34:52 +00:00
)
CMake+macOS: Make sure we're using the right Qt tools. Qt5CoreConfigExtras.cmake sets Qt5::qmake. Use it to find the corresponding path to macdeployqt and use those in osx-app.sh. Change-Id: I2e67f0126e272fc95d40476b9bfc83ab38d73cee Reviewed-on: https://code.wireshark.org/review/28359 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-20 22:59:41 +00:00
add_dependencies(copy_qt_dlls wireshark)
CMake: Enable install target on Windows (missing DLLs) Ping-Bug: 15301 Change-Id: I3146f43bcbae1abe566d96c8e9196019931474e2 Reviewed-on: https://code.wireshark.org/review/30818 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt>
2018-11-23 20:39:42 +00:00
install(CODE "execute_process(COMMAND
\"${QT_WINDEPLOYQT_EXECUTABLE}\"
--no-compiler-runtime
\"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/Wireshark.exe\")"
)
CMake+macOS: Make sure we're using the right Qt tools. Qt5CoreConfigExtras.cmake sets Qt5::qmake. Use it to find the corresponding path to macdeployqt and use those in osx-app.sh. Change-Id: I2e67f0126e272fc95d40476b9bfc83ab38d73cee Reviewed-on: https://code.wireshark.org/review/28359 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-20 22:59:41 +00:00
endif(QT_WINDEPLOYQT_EXECUTABLE)
Qt: Add the "Map" button to the Endpoints dialog. Move the map creation code from ui/gtk/hostlist_table.c to ui/traffic_table_ui.c. Add CMake commands to copy ipmap.html to the run directory so that WIRESHARK_RUN_FROM_BUILD_DIRECTORY works for the endpoint map. Not sure if they're entirely correct but they appear to work. Add boundary checkes to geoip_db_lookup_ipv[46]. To do: - It looks like there are prettier maps and newer APIs that we might want to use. Change-Id: Ie06992c9bc9c9aa683328aecab3f5f69c9cab966 Reviewed-on: https://code.wireshark.org/review/4011 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-05 18:17:17 +00:00
endif()
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
if(BUILD_logray AND QT_FOUND)
set(logray_LIBS
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
ui
capchild
caputils
wiretap
epan
version_info
${QT_LIBRARIES}
${APPLE_APPLICATION_SERVICES_LIBRARY}
${APPLE_APPKIT_LIBRARY}
${APPLE_CORE_FOUNDATION_LIBRARY}
${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
${SPARKLE_LIBRARIES}
${WIN_WS2_32_LIBRARY}
${WIN_VERSION_LIBRARY}
${WINSPARKLE_LIBRARIES}
$<$<BOOL:${WIN32}>:UxTheme.lib>
${SPEEXDSP_LIBRARIES}
${MINIZIP_LIBRARIES}
)
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
add_executable(logray WIN32 MACOSX_BUNDLE ${logray_FILES} ${EXTRA_BUNDLE_FILES})
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
if(WIN32 AND NOT BUILD_wireshark)
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT logray)
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
endif()
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
set(PROGLIST ${PROGLIST} logray)
set_target_properties(logray PROPERTIES
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
LINK_FLAGS "${WS_LINK_FLAGS}"
FOLDER "Executables"
INSTALL_RPATH "${EXECUTABLE_INSTALL_RPATH}"
AUTOMOC ON
AUTOUIC ON
AUTORCC ON
)
if(MSVC)
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
set_target_properties(logray PROPERTIES LINK_FLAGS_DEBUG "${WS_MSVC_DEBUG_LINK_FLAGS}")
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
endif()
if(ENABLE_APPLICATION_BUNDLE OR WIN32)
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
set_target_properties(logray PROPERTIES OUTPUT_NAME Logray)
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
endif()
if(ENABLE_APPLICATION_BUNDLE)
if(ASCIIDOCTOR_FOUND)
# Make sure to generate files referenced by
# BUNDLE_RESOURCE_SHARE_MAN1_FILES
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
add_dependencies(logray manpages)
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
endif()
set_target_properties(
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
logray PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_BINARY_DIR}/packaging/macosx/LograyInfo.plist
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
)
if(CMAKE_CFG_INTDIR STREQUAL ".")
# Add a wrapper script which opens the bundle. This adds
# convenience but makes debugging more difficult.
# It is not created if using Xcode
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
# XXX Running run/Logray.app/Contents/MacOS/Logray works
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
# fine for me (Gerald) here on Mojave. Can we just make this a
# symlink?
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
file(REMOVE ${CMAKE_BINARY_DIR}/run/logray)
file(WRITE ${CMAKE_BINARY_DIR}/run/logray "#!/bin/sh\n")
file(APPEND ${CMAKE_BINARY_DIR}/run/logray "# Generated by ${CMAKE_CURRENT_LIST_FILE}\n")
file(APPEND ${CMAKE_BINARY_DIR}/run/logray "# Wrapper script which should work around the issue described at\n")
file(APPEND ${CMAKE_BINARY_DIR}/run/logray "# https://stackoverflow.com/questions/25318524/what-exactly-should-i-pass-to-nsapp-activateignoringotherapps-to-get-my-appl\n")
file(APPEND ${CMAKE_BINARY_DIR}/run/logray "exec ${CMAKE_BINARY_DIR}/run/Logray.app/Contents/MacOS/Logray \"\$\@\"\n")
execute_process(COMMAND chmod a+x ${CMAKE_BINARY_DIR}/run/logray)
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
endif()
endif()
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
target_link_libraries(logray ${logray_LIBS})
target_include_directories(logray SYSTEM PRIVATE ${SPARKLE_INCLUDE_DIRS})
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
install(
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
TARGETS logray
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
)
if(QT_WINDEPLOYQT_EXECUTABLE)
add_custom_target(copy_ls_qt_dlls ALL)
set_target_properties(copy_ls_qt_dlls PROPERTIES FOLDER "Copy Tasks")
# Will we ever need to use --debug? Windeployqt seems to
# be smart enough to copy debug DLLs when needed.
add_custom_command(TARGET copy_ls_qt_dlls
POST_BUILD
COMMAND set "PATH=${QT_BIN_PATH};%PATH%"
COMMAND "${QT_WINDEPLOYQT_EXECUTABLE}"
--no-compiler-runtime
--verbose 0
$<$<BOOL:${MSVC}>:--pdb>
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
"$<TARGET_FILE:logray>"
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
)
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
add_dependencies(copy_ls_qt_dlls logray)
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
install(CODE "execute_process(COMMAND
\"${QT_WINDEPLOYQT_EXECUTABLE}\"
--no-compiler-runtime
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
\"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/Logray.exe\")"
Logshark: Add initial UI. Add a separate UI application named "Logshark". It's currently a very thin superclass of Wireshark, but that will change over time. Based on work by Loris Degioanni.
2021-12-23 21:55:15 +00:00
)
endif(QT_WINDEPLOYQT_EXECUTABLE)
endif()
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
if (BUILD_logray AND SINSP_FOUND)
CMake+Logwolf: Populate our Falco plugin directory. Create plugins/<version>/falco and copy over the Cloudtrail plugin.
2022-04-19 22:19:50 +00:00
add_custom_target(copy_falco_plugins)
add_custom_command(TARGET copy_falco_plugins
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
COMMAND ${CMAKE_COMMAND} -E make_directory ${LOGRAY_PLUGIN_DIR}/falco
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SINSP_PLUGINS} ${LOGRAY_PLUGIN_DIR}/falco
CMake+Logwolf: Populate our Falco plugin directory. Create plugins/<version>/falco and copy over the Cloudtrail plugin.
2022-04-19 22:19:50 +00:00
)
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
add_dependencies(logray copy_falco_plugins)
CMake+Logwolf: Populate our Falco plugin directory. Create plugins/<version>/falco and copy over the Cloudtrail plugin.
2022-04-19 22:19:50 +00:00
endif()
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
# Common properties for CLI executables
macro(set_extra_executable_properties _executable _folder)
set_target_properties(${_executable} PROPERTIES
Revert "Use CMAKE_EXE_LINKER_FLAGS to set link flags on executables." This reverts commit 84447550efdad68acfc69281750ed016f7f96716. Reason for revert: CMake's documentation for the flags variables is close to content-free, giving no indication what the link flags used in the link will be, given a combination of various CMAKE.*LINKER_FLAGS variables and LINK_FLAGS properties. That makes it extremely difficult to determine why this change happens to cause some executables to be linked with "/INCREMENTAL" and others to be linked with "/INCREMENTAL:YES", even though we add "/INCREMENTAL:NO" to WS_LINK_FLAGS and add WS_LINK_FLAGS to CMAKE_EXE_LINKER_FLAGS - or why *not* setting CMAKE_EXE_LINKER_FLAGS and instead using LINK_FLAGS *doesn't* cause that to happen. Maybe it's an issue of CMAKE_EXE_LINKER_FLAGS vs. CMAKE_EXE_LINKER_FLAGS_<CONFIG>, but the documentation doesn't clearly indicate whether, for example, the link flags for a particular executable target are a combination of CMAKE_EXE_LINKER_FLAGS, the CMAKE_EXE_LINKER_FLAGS_<CONFIG> flag for the configuration of this build, and the LINK_FLAGS property of the target, if any. That's the most *obvious* behavior to implement, but if that's the behavior that's implemented, I'm not sure why the change being reverted had the effect it did. Change-Id: I6a73fe88be65378d506a89460f7362076233f319 Reviewed-on: https://code.wireshark.org/review/30023 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot
2018-10-04 18:09:14 +00:00
LINK_FLAGS "${WILDCARD_OBJ} ${WS_LINK_FLAGS}"
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
FOLDER ${_folder}
CMake: Set a direct rpath for libraries Instead of using "$ORIGIN/../lib" just use "$ORIGIN". Also be explicit in configuring the relative RPATH. We don't want to assume a default relative path, in case more targets are addded, out of caution. Change-Id: I3b7f5e8de7be8bb30aca3b433212113d876c4163 Reviewed-on: https://code.wireshark.org/review/31647 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-21 10:56:57 +00:00
INSTALL_RPATH "${EXECUTABLE_INSTALL_RPATH}"
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
)
CMake: Add ENABLE_VLD option for MSVC Calling cmake with -DENABLE_VLD=ON when building with Visual Studio, results in debug configuration being linked to Visual Leak Detector. By default, Visual Leak Detector outputs the leak summary to Visual Studio debug window. When ENABLE_VLD is active, VLD is linked to all wireshark libraries and executables.
2021-03-29 10:10:16 +00:00
if(MSVC)
set_target_properties(${_executable} PROPERTIES LINK_FLAGS_DEBUG "${WS_MSVC_DEBUG_LINK_FLAGS}")
endif()
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
CMake: Build a complete application bundle on OS X. Run osx-app.sh by default on OS X. Aside from giving us a fully portable application bundle after building this should let us clear our library path at startup should the need arise. Change the name of the osx-app target to app_bundle. Search ../Frameworks before ../lib. Create PkgInfo at configure time instead of compile time. Build our program list as we go. Change-Id: If5511ee921108b1c079cef67026eac9e47211be1 Reviewed-on: https://code.wireshark.org/review/6896 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-01 21:56:39 +00:00
set(PROGLIST ${PROGLIST} ${_executable})
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
if(ENABLE_APPLICATION_BUNDLE)
Fix build paths for cmake's Xcode project generator on macOS. Multi-configuration generators (such as Xcode or VS) append the current build configuration to most paths (eg. Debug/Release). Currently this results in inconsistent paths for the application bundle and the included command line tools. This commit sets the correct path information for multi-configuration generators for macOS application bundles. The standard Makefile behaviour is untouched. One Windows specific configuration was changed, as it was conflicting with these changes. This needs to be checked before merging. Additionally the wrapper scripts are omitted for Xcode, as the path to the binaries depends on the configuration chosen in Xcode. Therefore it is not viable to create these scripts in the cmake run. Bug: 11816 Change-Id: Ib43d82eb04600a0e2f2b020afb44b579ffc7a7c9 Reviewed-on: https://code.wireshark.org/review/28291 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-15 10:44:47 +00:00
if(NOT CMAKE_CFG_INTDIR STREQUAL ".")
# Xcode
set_target_properties(${_executable} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY run/$<CONFIG>/Wireshark.app/Contents/MacOS
)
else ()
set_target_properties(${_executable} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY run/Wireshark.app/Contents/MacOS
)
CMake+macOS: Use symlinks for our CLI utilities. On macOS, <build directory>/run/wireshark is a wrapper script that execs run/Wireshark.app/Contents/MacOS/Wireshark so that Launch Services will activate our application properly. We don't need to worry about this for our other executables. Make them symlinks so that we can run things like `lldb run/tshark` with impunity. Change-Id: I4e656d778040ece722f873b1a7f6e6e60d21e2a6 Reviewed-on: https://code.wireshark.org/review/33071 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-05-03 19:20:47 +00:00
# Create a convenience link from run/<name> to its respective
# target in the application bundle.
add_custom_target(${_executable}-symlink
COMMAND ln -s -f
Wireshark.app/Contents/MacOS/${_executable}
${CMAKE_BINARY_DIR}/run/${_executable}
)
add_dependencies(${_executable} ${_executable}-symlink)
Fix build paths for cmake's Xcode project generator on macOS. Multi-configuration generators (such as Xcode or VS) append the current build configuration to most paths (eg. Debug/Release). Currently this results in inconsistent paths for the application bundle and the included command line tools. This commit sets the correct path information for multi-configuration generators for macOS application bundles. The standard Makefile behaviour is untouched. One Windows specific configuration was changed, as it was conflicting with these changes. This needs to be checked before merging. Additionally the wrapper scripts are omitted for Xcode, as the path to the binaries depends on the configuration chosen in Xcode. Therefore it is not viable to create these scripts in the cmake run. Bug: 11816 Change-Id: Ib43d82eb04600a0e2f2b020afb44b579ffc7a7c9 Reviewed-on: https://code.wireshark.org/review/28291 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-15 10:44:47 +00:00
endif()
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
endif()
endmacro()
CMake: Fix minimum version requirements for CentOS 8 target_link_options() requires CMake >= 3.13.
2021-09-21 18:15:09 +00:00
macro(executable_link_mingw_unicode _target)
# target_link_options() requires CMake >= 3.13
CMake: Remove an unnecessary version check MINGW implies WIN32 which implies CMake >= 3.13. Follow-up to 1dad8190b1ec4ab730de428437f2f6bbbf7ce345.
2021-09-22 13:48:06 +00:00
if (MINGW)
CMake: Fix minimum version requirements for CentOS 8 target_link_options() requires CMake >= 3.13.
2021-09-21 18:15:09 +00:00
target_link_options(${_target} PRIVATE "-municode")
endif()
endmacro()
CMakeLists.txt: Make sure TSHARK_TAP_SRC is defined before register_tap_files so that the "-z" flag works for TShark. epan/stat_cmd_args.c: Fixup whitespace. svn path=/trunk/; revision=40443
2012-01-12 19:16:15 +00:00
register_tap_files(tshark-tap-register.c
${TSHARK_TAP_SRC}
)
Rename build target to lowercase for consistency svn path=/trunk/; revision=29618
2009-08-29 09:13:28 +00:00
if(BUILD_tshark)
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
set(tshark_LIBS
Move tap-*-common.{h,c} into ui/ since that's the home for common UI functions. svn path=/trunk/; revision=50165
2013-06-26 02:12:12 +00:00
ui
Move the routines to talk to dumpcap into a static libcapchild. This pulls some stuff out of the top-level directory, and means we don't have to build them once for every program using them. Change-Id: I37b31fed20f2d5c3563ecd2bae9fd86af70afff5 Reviewed-on: https://code.wireshark.org/review/2591 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-23 23:48:41 +00:00
capchild
Move utility routines for capturing into a libcaputils static library. Some of those routines are used only in dumpcap; others are used in TShark and Wireshark as well. Change-Id: I9d92483f2fcff57a7d8b6bf6bdf2870505d19fb7 Reviewed-on: https://code.wireshark.org/review/2841 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-04 07:24:02 +00:00
caputils
CMake: Modernize config-file package support A CMake config-file package provides support for downstreams using CMake and Wireshark libraries to easily configure the libwireshark dependency with: find_package(Wireshark CONFIG [REQUIRED]) target_link_libraries(foo epan) The FindWireshark.cmake file is no longer needed. See cmake-package(7) for more details on CMake's package system. Change-Id: Ie8af1d44417a99dd08d37959f7b2ffca88572ec2 Reviewed-on: https://code.wireshark.org/review/29208 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-23 21:03:28 +00:00
wiretap
CMake: Fix some transitive link dependencies libwireshark and libwiretap have their INTERFACE link dependencies changed to the required set. libwsutil keeps a default public visibility. Further work may show some unneeded link requirements. The executable dependencies are adjusted accordingly. Change-Id: I3a534f72403819cac136ae47a3d80acee76e0fb3 Reviewed-on: https://code.wireshark.org/review/30815 Reviewed-by: João Valverde <j@v6e.pt>
2018-11-27 19:37:33 +00:00
epan
Move version_info.[ch] to ui/ Version info is an aspect of UI implementation so move it to a more appropriate place, such as ui/. This also helps declutter the top-level. A static library is appropriate to encapsulate the dependencies as private and it is better supported by CMake than object libraries. Also version_info.h should not be installed as a public header.
2021-07-03 11:58:30 +00:00
version_info
Link with CoreFoundation and SystemConfiguration and add cfuitils.c on OS X where needed. Dumpcap, rawshark and tshark don't appear to require Cocoa so remove it. svn path=/trunk/; revision=46144
2012-11-22 16:49:17 +00:00
${APPLE_CORE_FOUNDATION_LIBRARY}
${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
Windows: Modernize our WSAStartup usage. Make sure we link each application that calls WSAStartup with ws2_32.lib. Pass version 2.2 to WSAStartup. Wikipedia says it was introduced in 1996, so we should be OK. Ping-Bug: 15711 Change-Id: I431839e930e7c646669af7373789640b5180ec28 Reviewed-on: https://code.wireshark.org/review/33033 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Tomasz Moń <desowin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-04-30 22:48:06 +00:00
${WIN_WS2_32_LIBRARY}
CMake: Fix some transitive link dependencies libwireshark and libwiretap have their INTERFACE link dependencies changed to the required set. libwsutil keeps a default public visibility. Further work may show some unneeded link requirements. The executable dependencies are adjusted accordingly. Change-Id: I3a534f72403819cac136ae47a3d80acee76e0fb3 Reviewed-on: https://code.wireshark.org/review/30815 Reviewed-by: João Valverde <j@v6e.pt>
2018-11-27 19:37:33 +00:00
${M_LIBRARIES}
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
)
set(tshark_FILES
CMake: use object libraries to avoid redundant builds Some source files are duplicated via add_executable. Assuming that these are not affected by target-specific preprocessor macros, they can be built only once and shared among executables. In one configuration, this reduces the number of object files by 55 (cli_main.c and version_info.c alone were built 15 times each). Removes the version dependency from each target since the 'version_info' target can now declare this dependency. Remove CLEAN_C_FILES from extcap since it is not used to set -Werror. Due to removing some files from wireshark_FILES (and others), these are no longer part of checkAPIs though. Hopefully that is acceptable. Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58 Reviewed-on: https://code.wireshark.org/review/31509 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-12 11:43:18 +00:00
$<TARGET_OBJECTS:capture_opts>
$<TARGET_OBJECTS:cli_main>
$<TARGET_OBJECTS:shark_common>
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
tshark-tap-register.c
tshark.c
${TSHARK_TAP_SRC}
)
tshark: add -G elastic-mapping report. This option generates an ElasticSearch mapping file as described here: https://www.elastic.co/blog/analyzing-network-packets-with-wireshark-elasticsearch-and-kibana It leverages the Glib-json library. Change-Id: Iff25f991e87d3da07bf06654e353fb785799dde9 Reviewed-on: https://code.wireshark.org/review/26848 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-04-09 10:31:38 +00:00
Windows: Make our program details more consistent. Use a single template file for most of our program resources. Encode our resource files as UTF-8. Add resources to extcap/*.exe. Replace a regex with concatenation. Change-Id: I0ed49086618127ca4fdef69272f849d8f16e4dab Reviewed-on: https://code.wireshark.org/review/30088 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-08 23:34:39 +00:00
set_executable_resources(tshark "TShark" UNIQUE_RC)
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
add_executable(tshark ${tshark_FILES})
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
set_extra_executable_properties(tshark "Executables")
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
target_link_libraries(tshark ${tshark_LIBS})
CMake: Fix minimum version requirements for CentOS 8 target_link_options() requires CMake >= 3.13.
2021-09-21 18:15:09 +00:00
executable_link_mingw_unicode(tshark)
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
install(TARGETS tshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
We require CMake >= 2.6 so we don't have to repeat the expressions in endif() + friends svn path=/trunk/; revision=29589
2009-08-27 16:11:16 +00:00
endif()
Parts of http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1179 Frederic Heem: * More cmake system checks. It compiles dumpcap without running configure, svn path=/trunk/; revision=19672
2006-10-24 17:39:32 +00:00
TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). svn path=/trunk/; revision=54646
2014-01-08 04:35:28 +00:00
if(BUILD_tfshark)
set(tfshark_LIBS
tfshark: Link against libm ld: CMakeFiles/tfshark.dir/ui/cli/tap-icmpstat.c.o: undefined reference to symbol 'sqrt@@GLIBC_2.2.5' Change-Id: Ifbf49ba00a4246e68c1d3965f0257eca1b4e3ef8 Reviewed-on: https://code.wireshark.org/review/35854 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2020-01-17 14:06:51 +00:00
m
TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). svn path=/trunk/; revision=54646
2014-01-08 04:35:28 +00:00
ui
CMake: Modernize config-file package support A CMake config-file package provides support for downstreams using CMake and Wireshark libraries to easily configure the libwireshark dependency with: find_package(Wireshark CONFIG [REQUIRED]) target_link_libraries(foo epan) The FindWireshark.cmake file is no longer needed. See cmake-package(7) for more details on CMake's package system. Change-Id: Ie8af1d44417a99dd08d37959f7b2ffca88572ec2 Reviewed-on: https://code.wireshark.org/review/29208 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-23 21:03:28 +00:00
wiretap
CMake: Fix some transitive link dependencies libwireshark and libwiretap have their INTERFACE link dependencies changed to the required set. libwsutil keeps a default public visibility. Further work may show some unneeded link requirements. The executable dependencies are adjusted accordingly. Change-Id: I3a534f72403819cac136ae47a3d80acee76e0fb3 Reviewed-on: https://code.wireshark.org/review/30815 Reviewed-by: João Valverde <j@v6e.pt>
2018-11-27 19:37:33 +00:00
epan
Move version_info.[ch] to ui/ Version info is an aspect of UI implementation so move it to a more appropriate place, such as ui/. This also helps declutter the top-level. A static library is appropriate to encapsulate the dependencies as private and it is better supported by CMake than object libraries. Also version_info.h should not be installed as a public header.
2021-07-03 11:58:30 +00:00
version_info
TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). svn path=/trunk/; revision=54646
2014-01-08 04:35:28 +00:00
${APPLE_CORE_FOUNDATION_LIBRARY}
${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
)
set(tfshark_FILES
CMake: use object libraries to avoid redundant builds Some source files are duplicated via add_executable. Assuming that these are not affected by target-specific preprocessor macros, they can be built only once and shared among executables. In one configuration, this reduces the number of object files by 55 (cli_main.c and version_info.c alone were built 15 times each). Removes the version dependency from each target since the 'version_info' target can now declare this dependency. Remove CLEAN_C_FILES from extcap since it is not used to set -Werror. Due to removing some files from wireshark_FILES (and others), these are no longer part of checkAPIs though. Hopefully that is acceptable. Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58 Reviewed-on: https://code.wireshark.org/review/31509 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-12 11:43:18 +00:00
$<TARGET_OBJECTS:cli_main>
$<TARGET_OBJECTS:shark_common>
TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). svn path=/trunk/; revision=54646
2014-01-08 04:35:28 +00:00
tfshark.c
${TSHARK_TAP_SRC}
)
Windows: Make our program details more consistent. Use a single template file for most of our program resources. Encode our resource files as UTF-8. Add resources to extcap/*.exe. Replace a regex with concatenation. Change-Id: I0ed49086618127ca4fdef69272f849d8f16e4dab Reviewed-on: https://code.wireshark.org/review/30088 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-08 23:34:39 +00:00
set_executable_resources(tfshark "TFShark")
TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). svn path=/trunk/; revision=54646
2014-01-08 04:35:28 +00:00
add_executable(tfshark ${tfshark_FILES})
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
set_extra_executable_properties(tfshark "Executables")
TFShark (Terminal Fileshark) v.001. Bug 9607 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9607) This is a VERY PRELIMINARY version of tfshark. It's an attempt to jumpstart FileShark and its architecture. Right now it's mostly just a very stripped down version of tshark with all of the necessary build modifications (including now building filetap library since tfshark depends on it) This code has helped me identify what I believe to be all of the necessary layers for a complete fileshark architecture. And those layers will slowly be added in time (patches always welcome!). svn path=/trunk/; revision=54646
2014-01-08 04:35:28 +00:00
target_link_libraries(tfshark ${tfshark_LIBS})
install(TARGETS tfshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
Only build rawshark and dumpcap if we have libpcap svn path=/trunk/; revision=38780
2011-08-29 19:18:28 +00:00
if(BUILD_rawshark AND PCAP_FOUND)
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
set(rawshark_LIBS
Move utility routines for capturing into a libcaputils static library. Some of those routines are used only in dumpcap; others are used in TShark and Wireshark as well. Change-Id: I9d92483f2fcff57a7d8b6bf6bdf2870505d19fb7 Reviewed-on: https://code.wireshark.org/review/2841 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-04 07:24:02 +00:00
caputils
Link rawshark with libui. No need to select one source file from libui and build it independently; just go ahead and link. Change-Id: Ie451b736411bcdac52ccde56f329c933a0065ead Reviewed-on: https://code.wireshark.org/review/20967 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-08 21:44:00 +00:00
ui
CMake: Modernize config-file package support A CMake config-file package provides support for downstreams using CMake and Wireshark libraries to easily configure the libwireshark dependency with: find_package(Wireshark CONFIG [REQUIRED]) target_link_libraries(foo epan) The FindWireshark.cmake file is no longer needed. See cmake-package(7) for more details on CMake's package system. Change-Id: Ie8af1d44417a99dd08d37959f7b2ffca88572ec2 Reviewed-on: https://code.wireshark.org/review/29208 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-23 21:03:28 +00:00
wiretap
CMake: Fix some transitive link dependencies libwireshark and libwiretap have their INTERFACE link dependencies changed to the required set. libwsutil keeps a default public visibility. Further work may show some unneeded link requirements. The executable dependencies are adjusted accordingly. Change-Id: I3a534f72403819cac136ae47a3d80acee76e0fb3 Reviewed-on: https://code.wireshark.org/review/30815 Reviewed-by: João Valverde <j@v6e.pt>
2018-11-27 19:37:33 +00:00
epan
Move version_info.[ch] to ui/ Version info is an aspect of UI implementation so move it to a more appropriate place, such as ui/. This also helps declutter the top-level. A static library is appropriate to encapsulate the dependencies as private and it is better supported by CMake than object libraries. Also version_info.h should not be installed as a public header.
2021-07-03 11:58:30 +00:00
version_info
Link with CoreFoundation and SystemConfiguration and add cfuitils.c on OS X where needed. Dumpcap, rawshark and tshark don't appear to require Cocoa so remove it. svn path=/trunk/; revision=46144
2012-11-22 16:49:17 +00:00
${APPLE_CORE_FOUNDATION_LIBRARY}
${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
Windows: Modernize our WSAStartup usage. Make sure we link each application that calls WSAStartup with ws2_32.lib. Pass version 2.2 to WSAStartup. Wikipedia says it was introduced in 1996, so we should be OK. Ping-Bug: 15711 Change-Id: I431839e930e7c646669af7373789640b5180ec28 Reviewed-on: https://code.wireshark.org/review/33033 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Tomasz Moń <desowin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-04-30 22:48:06 +00:00
${WIN_WS2_32_LIBRARY}
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
)
set(rawshark_FILES
CMake: use object libraries to avoid redundant builds Some source files are duplicated via add_executable. Assuming that these are not affected by target-specific preprocessor macros, they can be built only once and shared among executables. In one configuration, this reduces the number of object files by 55 (cli_main.c and version_info.c alone were built 15 times each). Removes the version dependency from each target since the 'version_info' target can now declare this dependency. Remove CLEAN_C_FILES from extcap since it is not used to set -Werror. Due to removing some files from wireshark_FILES (and others), these are no longer part of checkAPIs though. Hopefully that is acceptable. Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58 Reviewed-on: https://code.wireshark.org/review/31509 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-12 11:43:18 +00:00
$<TARGET_OBJECTS:cli_main>
$<TARGET_OBJECTS:shark_common>
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
rawshark.c
)
Windows: Make our program details more consistent. Use a single template file for most of our program resources. Encode our resource files as UTF-8. Add resources to extcap/*.exe. Replace a regex with concatenation. Change-Id: I0ed49086618127ca4fdef69272f849d8f16e4dab Reviewed-on: https://code.wireshark.org/review/30088 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-08 23:34:39 +00:00
set_executable_resources(rawshark "Rawshark")
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
add_executable(rawshark ${rawshark_FILES})
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
set_extra_executable_properties(rawshark "Executables")
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
target_link_libraries(rawshark ${rawshark_LIBS})
CMake: Fix minimum version requirements for CentOS 8 target_link_options() requires CMake >= 3.13.
2021-09-21 18:15:09 +00:00
executable_link_mingw_unicode(rawshark)
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
install(TARGETS rawshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
Rename build target to lowercase for consistency svn path=/trunk/; revision=29618
2009-08-29 09:13:28 +00:00
endif()
Add sharkd - daemon variant sharkd listens on UNIX socket and allows external clients to run commands like: loading file, analysing frames or running TAP(s). Change-Id: I443b2865e4adfd1c11f4f57d09ff7fce6b1e8766 Reviewed-on: https://code.wireshark.org/review/18208 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2016-10-15 18:48:17 +00:00
if(BUILD_sharkd)
set(sharkd_LIBS
ui
CMake: Modernize config-file package support A CMake config-file package provides support for downstreams using CMake and Wireshark libraries to easily configure the libwireshark dependency with: find_package(Wireshark CONFIG [REQUIRED]) target_link_libraries(foo epan) The FindWireshark.cmake file is no longer needed. See cmake-package(7) for more details on CMake's package system. Change-Id: Ie8af1d44417a99dd08d37959f7b2ffca88572ec2 Reviewed-on: https://code.wireshark.org/review/29208 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-23 21:03:28 +00:00
wiretap
CMake: Fix some transitive link dependencies libwireshark and libwiretap have their INTERFACE link dependencies changed to the required set. libwsutil keeps a default public visibility. Further work may show some unneeded link requirements. The executable dependencies are adjusted accordingly. Change-Id: I3a534f72403819cac136ae47a3d80acee76e0fb3 Reviewed-on: https://code.wireshark.org/review/30815 Reviewed-by: João Valverde <j@v6e.pt>
2018-11-27 19:37:33 +00:00
epan
Move version_info.[ch] to ui/ Version info is an aspect of UI implementation so move it to a more appropriate place, such as ui/. This also helps declutter the top-level. A static library is appropriate to encapsulate the dependencies as private and it is better supported by CMake than object libraries. Also version_info.h should not be installed as a public header.
2021-07-03 11:58:30 +00:00
version_info
Add sharkd - daemon variant sharkd listens on UNIX socket and allows external clients to run commands like: loading file, analysing frames or running TAP(s). Change-Id: I443b2865e4adfd1c11f4f57d09ff7fce6b1e8766 Reviewed-on: https://code.wireshark.org/review/18208 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2016-10-15 18:48:17 +00:00
${APPLE_CORE_FOUNDATION_LIBRARY}
${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
Windows: Modernize our WSAStartup usage. Make sure we link each application that calls WSAStartup with ws2_32.lib. Pass version 2.2 to WSAStartup. Wikipedia says it was introduced in 1996, so we should be OK. Ping-Bug: 15711 Change-Id: I431839e930e7c646669af7373789640b5180ec28 Reviewed-on: https://code.wireshark.org/review/33033 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Tomasz Moń <desowin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-04-30 22:48:06 +00:00
${WIN_WS2_32_LIBRARY}
CMake: Check for and use system SpeexDSP library Change-Id: I8443379d23a2946dd21c12e5e0bd5464ab73ca25 Reviewed-on: https://code.wireshark.org/review/31857 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-02-02 14:52:07 +00:00
${SPEEXDSP_LIBRARIES}
sharkd: link with libm because of Speex When builing without the Speex library the build inserts its own files to handle the codec conversion. These however require sharkd to be linked against libm, for the sine function. Change-Id: I80b3fd67a346849480976c00280537b786780627 Reviewed-on: https://code.wireshark.org/review/33582 Reviewed-by: Vasil Velichkov <vvvelichkov@gmail.com> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-13 04:33:55 +00:00
${M_LIBRARIES}
Add sharkd - daemon variant sharkd listens on UNIX socket and allows external clients to run commands like: loading file, analysing frames or running TAP(s). Change-Id: I443b2865e4adfd1c11f4f57d09ff7fce6b1e8766 Reviewed-on: https://code.wireshark.org/review/18208 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2016-10-15 18:48:17 +00:00
)
set(sharkd_FILES
Put the main() and wmain() routines for CLI programs into a separate file. That means that code is only in one place, rather than having copies of it in each of those programs. CLI programs that, on Windows, should get UTF-8 arguments rather than arguments in the local code page should: include the top-level cli_main.h header; define the main function as real_main(); be built with the top-level cli_main.c file. On UN*X, cli_main.c has a main() program, and just passes the arguments on to real_main(). On Windows, cli_main.c has a wmain() function that converts the UTF-16 arguments it's handed to UTF-8 arguments, using WideCharToMultiByte() so that it doesn't use any functions other than those provided by the system, and then calls real_main() with the argument count and UTF-8 arguments. Change-Id: I8b11f01dbc5c63fce599d1bef9ad96cd92c3c01e Reviewed-on: https://code.wireshark.org/review/31017 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-12 10:53:08 +00:00
#
# XXX - currently doesn't work on Windows if it uses
CMake: use object libraries to avoid redundant builds Some source files are duplicated via add_executable. Assuming that these are not affected by target-specific preprocessor macros, they can be built only once and shared among executables. In one configuration, this reduces the number of object files by 55 (cli_main.c and version_info.c alone were built 15 times each). Removes the version dependency from each target since the 'version_info' target can now declare this dependency. Remove CLEAN_C_FILES from extcap since it is not used to set -Werror. Due to removing some files from wireshark_FILES (and others), these are no longer part of checkAPIs though. Hopefully that is acceptable. Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58 Reviewed-on: https://code.wireshark.org/review/31509 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-12 11:43:18 +00:00
# $<TARGET_OBJECTS:cli_main> and has real_main().
Put the main() and wmain() routines for CLI programs into a separate file. That means that code is only in one place, rather than having copies of it in each of those programs. CLI programs that, on Windows, should get UTF-8 arguments rather than arguments in the local code page should: include the top-level cli_main.h header; define the main function as real_main(); be built with the top-level cli_main.c file. On UN*X, cli_main.c has a main() program, and just passes the arguments on to real_main(). On Windows, cli_main.c has a wmain() function that converts the UTF-16 arguments it's handed to UTF-8 arguments, using WideCharToMultiByte() so that it doesn't use any functions other than those provided by the system, and then calls real_main() with the argument count and UTF-8 arguments. Change-Id: I8b11f01dbc5c63fce599d1bef9ad96cd92c3c01e Reviewed-on: https://code.wireshark.org/review/31017 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-12 10:53:08 +00:00
#
CMake: use object libraries to avoid redundant builds Some source files are duplicated via add_executable. Assuming that these are not affected by target-specific preprocessor macros, they can be built only once and shared among executables. In one configuration, this reduces the number of object files by 55 (cli_main.c and version_info.c alone were built 15 times each). Removes the version dependency from each target since the 'version_info' target can now declare this dependency. Remove CLEAN_C_FILES from extcap since it is not used to set -Werror. Due to removing some files from wireshark_FILES (and others), these are no longer part of checkAPIs though. Hopefully that is acceptable. Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58 Reviewed-on: https://code.wireshark.org/review/31509 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-12 11:43:18 +00:00
$<TARGET_OBJECTS:shark_common>
Add sharkd - daemon variant sharkd listens on UNIX socket and allows external clients to run commands like: loading file, analysing frames or running TAP(s). Change-Id: I443b2865e4adfd1c11f4f57d09ff7fce6b1e8766 Reviewed-on: https://code.wireshark.org/review/18208 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2016-10-15 18:48:17 +00:00
sharkd.c
sharkd_daemon.c
sharkd_session.c
)
Windows: Make our program details more consistent. Use a single template file for most of our program resources. Encode our resource files as UTF-8. Add resources to extcap/*.exe. Replace a regex with concatenation. Change-Id: I0ed49086618127ca4fdef69272f849d8f16e4dab Reviewed-on: https://code.wireshark.org/review/30088 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-08 23:34:39 +00:00
set_executable_resources(sharkd "SharkD")
Add sharkd - daemon variant sharkd listens on UNIX socket and allows external clients to run commands like: loading file, analysing frames or running TAP(s). Change-Id: I443b2865e4adfd1c11f4f57d09ff7fce6b1e8766 Reviewed-on: https://code.wireshark.org/review/18208 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2016-10-15 18:48:17 +00:00
add_executable(sharkd ${sharkd_FILES})
set_extra_executable_properties(sharkd "Executables")
target_link_libraries(sharkd ${sharkd_LIBS})
CMake: Use target_include_directores more. The include_directories documentation at https://cmake.org/cmake/help/latest/command/include_directories.html says: "Note: Prefer the target_include_directories() command to add include directories to individual targets and optionally propagate/export them to dependents." Switch from include_directories to target_include_directories in a bunch of places. Add "SYSTEM" to the remaining external include_directories calls in order to minimize our compiler warning blast radius.
2021-02-17 02:04:59 +00:00
target_include_directories(sharkd SYSTEM PUBLIC ${SPEEXDSP_INCLUDE_DIRS})
CMake: Fix some transitive link dependencies libwireshark and libwiretap have their INTERFACE link dependencies changed to the required set. libwsutil keeps a default public visibility. Further work may show some unneeded link requirements. The executable dependencies are adjusted accordingly. Change-Id: I3a534f72403819cac136ae47a3d80acee76e0fb3 Reviewed-on: https://code.wireshark.org/review/30815 Reviewed-by: João Valverde <j@v6e.pt>
2018-11-27 19:37:33 +00:00
Add sharkd - daemon variant sharkd listens on UNIX socket and allows external clients to run commands like: loading file, analysing frames or running TAP(s). Change-Id: I443b2865e4adfd1c11f4f57d09ff7fce6b1e8766 Reviewed-on: https://code.wireshark.org/review/18208 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2016-10-15 18:48:17 +00:00
install(TARGETS sharkd RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
if(BUILD_dftest)
set(dftest_LIBS
Link dftest with libui. No need to select one source file from libui and build it independently; just go ahead and link. Change-Id: I7ae5d8f9b83832518a4fb3430cb348e8c4d6b7ab Reviewed-on: https://code.wireshark.org/review/20968 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-08 21:59:31 +00:00
ui
CMake: Modernize config-file package support A CMake config-file package provides support for downstreams using CMake and Wireshark libraries to easily configure the libwireshark dependency with: find_package(Wireshark CONFIG [REQUIRED]) target_link_libraries(foo epan) The FindWireshark.cmake file is no longer needed. See cmake-package(7) for more details on CMake's package system. Change-Id: Ie8af1d44417a99dd08d37959f7b2ffca88572ec2 Reviewed-on: https://code.wireshark.org/review/29208 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-23 21:03:28 +00:00
wiretap
CMake: Fix some transitive link dependencies libwireshark and libwiretap have their INTERFACE link dependencies changed to the required set. libwsutil keeps a default public visibility. Further work may show some unneeded link requirements. The executable dependencies are adjusted accordingly. Change-Id: I3a534f72403819cac136ae47a3d80acee76e0fb3 Reviewed-on: https://code.wireshark.org/review/30815 Reviewed-by: João Valverde <j@v6e.pt>
2018-11-27 19:37:33 +00:00
epan
Move version_info.[ch] to ui/ Version info is an aspect of UI implementation so move it to a more appropriate place, such as ui/. This also helps declutter the top-level. A static library is appropriate to encapsulate the dependencies as private and it is better supported by CMake than object libraries. Also version_info.h should not be installed as a public header.
2021-07-03 11:58:30 +00:00
version_info
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
)
set(dftest_FILES
Reflect the move of dftest.c back to the top-level directory. svn path=/trunk/; revision=41065
2012-02-19 08:59:17 +00:00
dftest.c
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
)
win/cmake: missing rc files to set icon and copyright Closes #17761
2021-12-12 21:11:17 +00:00
set_executable_resources(dftest "Dftest")
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
add_executable(dftest ${dftest_FILES})
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
set_extra_executable_properties(dftest "Tests")
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
target_link_libraries(dftest ${dftest_LIBS})
Rename build target to lowercase for consistency svn path=/trunk/; revision=29618
2009-08-29 09:13:28 +00:00
endif()
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
if(BUILD_randpkt)
set(randpkt_LIBS
Build the extcap programs in the extcap directory. That lets the version of Wireshark built with autotools find the extcap programs. Don't install the extcap programs under ${datadir} - that puts it under a share directory, and share directories are for platform-independent files, which executable images aren't (they're instruction-set dependent, hence platform-dependent). Change-Id: I992eeb984bdbe6b3476777f7114628c83df6080f Reviewed-on: https://code.wireshark.org/review/13943 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-15 01:00:38 +00:00
randpkt_core
Use cfile_write_failure_message() in the randpkt code. Change-Id: I32ef7ff85f854782e5dd02c3e7f12436a120bc13 Reviewed-on: https://code.wireshark.org/review/21259 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-20 21:07:06 +00:00
ui
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
wiretap
Add CMake properties to targets so that they are logically organised when using a Visual Studio solution. Add CMake properties to group the source files in epan into logical blocks when using a Visual Studio solution. svn path=/trunk/; revision=52580
2013-10-13 09:21:55 +00:00
wsutil
Update to add the last missing detection stuff. Some of it is untested, kerberos is currently a hack. Apart from that, package detection should be complete. svn path=/trunk/; revision=29838
2009-09-10 07:04:54 +00:00
${M_LIBRARIES}
CMAKE: Get most of of missing *build* pieces into place svn path=/trunk/; revision=29819
2009-09-09 13:20:33 +00:00
${CARES_LIBRARIES}
Commit 32350 replaced the self written FindZ.cmake by cmakes FindZLIB.cmake. What it didn't do was do adapt the magic names that are derived from the name of the FindXXX.cmake script. Fix that. Also add $Id$ to the FindZLIB.cmake script. svn path=/trunk/; revision=32899
2010-05-19 13:05:35 +00:00
${ZLIB_LIBRARIES}
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
)
set(randpkt_FILES
CMake: use object libraries to avoid redundant builds Some source files are duplicated via add_executable. Assuming that these are not affected by target-specific preprocessor macros, they can be built only once and shared among executables. In one configuration, this reduces the number of object files by 55 (cli_main.c and version_info.c alone were built 15 times each). Removes the version dependency from each target since the 'version_info' target can now declare this dependency. Remove CLEAN_C_FILES from extcap since it is not used to set -Werror. Due to removing some files from wireshark_FILES (and others), these are no longer part of checkAPIs though. Hopefully that is acceptable. Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58 Reviewed-on: https://code.wireshark.org/review/31509 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-12 11:43:18 +00:00
$<TARGET_OBJECTS:cli_main>
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
randpkt.c
)
win/cmake: missing rc files to set icon and copyright Closes #17761
2021-12-12 21:11:17 +00:00
set_executable_resources(randpkt "Randpkt"
COPYRIGHT_INFO "Copyright (C) 1999 by Gilbert Ramirez <gram@alumni.rice.edu>")
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
add_executable(randpkt ${randpkt_FILES})
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
set_extra_executable_properties(randpkt "Executables")
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
target_link_libraries(randpkt ${randpkt_LIBS})
CMake: Fix minimum version requirements for CentOS 8 target_link_options() requires CMake >= 3.13.
2021-09-21 18:15:09 +00:00
executable_link_mingw_unicode(randpkt)
dftest and rawshark now build. tshark might build. svn path=/trunk/; revision=29786
2009-09-08 07:03:57 +00:00
install(TARGETS randpkt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
We require CMake >= 2.6 so we don't have to repeat the expressions in endif() + friends svn path=/trunk/; revision=29589
2009-08-27 16:11:16 +00:00
endif()
Build the other tools that don't depend on libwireshark (editcap, capinfo, text2pcap, mergecap). svn path=/trunk/; revision=28759
2009-06-16 05:37:46 +00:00
fuzzshark: integrate oss-fuzz targets in CMake The current fuzzshark target built by CMake is not usable for fuzzing. Address this by adding a new ENABLE_FUZZER option that enables mandatory instrumentation and libFuzzer linking options for the fuzzshark binary. Create more CMake targets for specific fuzzing targets such as fuzzshark_ip and fuzzshark_ip_proto-udp. These targets are not built by default, either build individual targets or use the all-fuzzers target. Now these binaries are not specific to oss-fuzz, so move them to a new directory (perhaps the corpora can be added here in the future). oss-fuzz build.sh is simplified and reuses the CMake targets. When OSS_FUZZ is set, it will force static linking with external libraries and limit parallel linker jobs (maybe not necessary for Google's oss-fuzz builders, but my 8G/6c VM ran out of memory). Change-Id: If3ba8f60ea1f5c3bd2131223050a81f9acbce05d Reviewed-on: https://code.wireshark.org/review/30228 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-16 22:47:20 +00:00
if(BUILD_fuzzshark OR ENABLE_FUZZER OR OSS_FUZZ)
add_subdirectory(fuzz)
Add fuzzshark to cmake/autotools. Add fuzzshark target to make sure that oss-fuzzshark always build. Change-Id: I802b679c18023daa1475a54bae722b5e90c72a59 Reviewed-on: https://code.wireshark.org/review/24716 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-12-06 20:10:29 +00:00
endif()
- Properly detect and use the perl command. - Rename EDITCAP_... to editcap_... and the like. This should make it easier to later loop around some of the entries instead of processing each individually. svn path=/trunk/; revision=28760
2009-06-16 05:52:16 +00:00
if(BUILD_text2pcap)
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
set(text2pcap_LIBS
text2pcap: Use wtap_dumper Use wtap_dump instead of the pcapio functions for writing files. This makes it easier to unify with text_import, and also makes it easier to eventually write other file formats (with a similar option to the other CLI programs), and allows using the standard CLI error messages. Also move some of the option validation before attempting to open the output file.
2021-12-20 05:30:04 +00:00
wiretap
text2pcap needs only the wsutil lib, not the wiretap lib (as far as I can see). svn path=/trunk/; revision=46600
2012-12-18 22:56:06 +00:00
wsutil
text2pcap: Use wtap_dumper Use wtap_dump instead of the pcapio functions for writing files. This makes it easier to unify with text_import, and also makes it easier to eventually write other file formats (with a similar option to the other CLI programs), and allows using the standard CLI error messages. Also move some of the option validation before attempting to open the output file.
2021-12-20 05:30:04 +00:00
ui
text2pcap: Call text_import Have text2pcap call text_import to do the work. Related to #16724.
2021-12-22 15:06:25 +00:00
epan
Move version_info.[ch] to ui/ Version info is an aspect of UI implementation so move it to a more appropriate place, such as ui/. This also helps declutter the top-level. A static library is appropriate to encapsulate the dependencies as private and it is better supported by CMake than object libraries. Also version_info.h should not be installed as a public header.
2021-07-03 11:58:30 +00:00
version_info
Update to add the last missing detection stuff. Some of it is untested, kerberos is currently a hack. Apart from that, package detection should be complete. svn path=/trunk/; revision=29838
2009-09-10 07:04:54 +00:00
${M_LIBRARIES}
Commit 32350 replaced the self written FindZ.cmake by cmakes FindZLIB.cmake. What it didn't do was do adapt the magic names that are derived from the name of the FindXXX.cmake script. Fix that. Also add $Id$ to the FindZLIB.cmake script. svn path=/trunk/; revision=32899
2010-05-19 13:05:35 +00:00
${ZLIB_LIBRARIES}
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
)
Treat the text2pcap scanner as clean. We now disable some warnings on Flex-generated code. Change-Id: I8ff242dc17e7345e9d5883354e921642cb0118fd Reviewed-on: https://code.wireshark.org/review/25823 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-16 22:51:51 +00:00
set(text2pcap_FILES
CMake: use object libraries to avoid redundant builds Some source files are duplicated via add_executable. Assuming that these are not affected by target-specific preprocessor macros, they can be built only once and shared among executables. In one configuration, this reduces the number of object files by 55 (cli_main.c and version_info.c alone were built 15 times each). Removes the version dependency from each target since the 'version_info' target can now declare this dependency. Remove CLEAN_C_FILES from extcap since it is not used to set -Werror. Due to removing some files from wireshark_FILES (and others), these are no longer part of checkAPIs though. Hopefully that is acceptable. Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58 Reviewed-on: https://code.wireshark.org/review/31509 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-12 11:43:18 +00:00
$<TARGET_OBJECTS:cli_main>
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
text2pcap.c
)
Windows: Make our program details more consistent. Use a single template file for most of our program resources. Encode our resource files as UTF-8. Add resources to extcap/*.exe. Replace a regex with concatenation. Change-Id: I0ed49086618127ca4fdef69272f849d8f16e4dab Reviewed-on: https://code.wireshark.org/review/30088 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-08 23:34:39 +00:00
set_executable_resources(text2pcap "Text2pcap"
COPYRIGHT_INFO "2001 Ashok Narayanan <ashokn@cisco.com>")
add_executable(text2pcap ${text2pcap_FILES})
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
set_extra_executable_properties(text2pcap "Executables")
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
target_link_libraries(text2pcap ${text2pcap_LIBS})
CMake: Fix minimum version requirements for CentOS 8 target_link_options() requires CMake >= 3.13.
2021-09-21 18:15:09 +00:00
executable_link_mingw_unicode(text2pcap)
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
install(TARGETS text2pcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
We require CMake >= 2.6 so we don't have to repeat the expressions in endif() + friends svn path=/trunk/; revision=29589
2009-08-27 16:11:16 +00:00
endif()
Build the other tools that don't depend on libwireshark (editcap, capinfo, text2pcap, mergecap). svn path=/trunk/; revision=28759
2009-06-16 05:37:46 +00:00
- Properly detect and use the perl command. - Rename EDITCAP_... to editcap_... and the like. This should make it easier to later loop around some of the entries instead of processing each individually. svn path=/trunk/; revision=28760
2009-06-16 05:52:16 +00:00
if(BUILD_mergecap)
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
set(mergecap_LIBS
Take the error message generation out of the merge_files routines. Have them just return the information needed for the caller to produce an error message, and have the callers use the new cfile_ routines for reporting errors. This requires that the "write failure alert box" routine take the *input* file name as an argument, so that, on a merge, if the problem is that a record from a given input file can't be written out to the type of output file we're generating, the input file name can be given, along with the record number in that file. Change-Id: If5a5e00539e7e652008a523dec92c0b359a48e71 Reviewed-on: https://code.wireshark.org/review/21257 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-20 20:25:21 +00:00
ui
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
wiretap
Move version_info.[ch] to ui/ Version info is an aspect of UI implementation so move it to a more appropriate place, such as ui/. This also helps declutter the top-level. A static library is appropriate to encapsulate the dependencies as private and it is better supported by CMake than object libraries. Also version_info.h should not be installed as a public header.
2021-07-03 11:58:30 +00:00
version_info
Commit 32350 replaced the self written FindZ.cmake by cmakes FindZLIB.cmake. What it didn't do was do adapt the magic names that are derived from the name of the FindXXX.cmake script. Fix that. Also add $Id$ to the FindZLIB.cmake script. svn path=/trunk/; revision=32899
2010-05-19 13:05:35 +00:00
${ZLIB_LIBRARIES}
Implement in cmake: http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=51322 > User: guy > Date: 2013/08/12 01:01 PM > > Log: > Just check whether dladdr() is available; we check in the code whether > it succeeds, so there's no point in checking whether it succeeds in a > sample program. svn path=/trunk/; revision=51334
2013-08-13 09:58:09 +00:00
${CMAKE_DL_LIBS}
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
)
set(mergecap_FILES
CMake: use object libraries to avoid redundant builds Some source files are duplicated via add_executable. Assuming that these are not affected by target-specific preprocessor macros, they can be built only once and shared among executables. In one configuration, this reduces the number of object files by 55 (cli_main.c and version_info.c alone were built 15 times each). Removes the version dependency from each target since the 'version_info' target can now declare this dependency. Remove CLEAN_C_FILES from extcap since it is not used to set -Werror. Due to removing some files from wireshark_FILES (and others), these are no longer part of checkAPIs though. Hopefully that is acceptable. Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58 Reviewed-on: https://code.wireshark.org/review/31509 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-12 11:43:18 +00:00
$<TARGET_OBJECTS:cli_main>
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
mergecap.c
)
Windows: Make our program details more consistent. Use a single template file for most of our program resources. Encode our resource files as UTF-8. Add resources to extcap/*.exe. Replace a regex with concatenation. Change-Id: I0ed49086618127ca4fdef69272f849d8f16e4dab Reviewed-on: https://code.wireshark.org/review/30088 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-08 23:34:39 +00:00
set_executable_resources(mergecap "Mergecap")
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
add_executable(mergecap ${mergecap_FILES})
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
set_extra_executable_properties(mergecap "Executables")
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
target_link_libraries(mergecap ${mergecap_LIBS})
CMake: Fix minimum version requirements for CentOS 8 target_link_options() requires CMake >= 3.13.
2021-09-21 18:15:09 +00:00
executable_link_mingw_unicode(mergecap)
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
install(TARGETS mergecap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
We require CMake >= 2.6 so we don't have to repeat the expressions in endif() + friends svn path=/trunk/; revision=29589
2009-08-27 16:11:16 +00:00
endif()
Build the other tools that don't depend on libwireshark (editcap, capinfo, text2pcap, mergecap). svn path=/trunk/; revision=28759
2009-06-16 05:37:46 +00:00
From Jim Young, bug 7745. Add Makefile support for reordercap. svn path=/trunk/; revision=45090
2012-09-24 10:23:20 +00:00
if(BUILD_reordercap)
set(reordercap_LIBS
Use the new cfile_XXX_failure_message() routines more broadly. Change-Id: I7814b3fd0353f4836ae61cbdbd4e13f659cbcb59 Reviewed-on: https://code.wireshark.org/review/21239 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-20 07:19:01 +00:00
ui
From Jim Young, bug 7745. Add Makefile support for reordercap. svn path=/trunk/; revision=45090
2012-09-24 10:23:20 +00:00
wiretap
Move version_info.[ch] to ui/ Version info is an aspect of UI implementation so move it to a more appropriate place, such as ui/. This also helps declutter the top-level. A static library is appropriate to encapsulate the dependencies as private and it is better supported by CMake than object libraries. Also version_info.h should not be installed as a public header.
2021-07-03 11:58:30 +00:00
version_info
From Jim Young, bug 7745. Add Makefile support for reordercap. svn path=/trunk/; revision=45090
2012-09-24 10:23:20 +00:00
${ZLIB_LIBRARIES}
Implement in cmake: http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=51322 > User: guy > Date: 2013/08/12 01:01 PM > > Log: > Just check whether dladdr() is available; we check in the code whether > it succeeds, so there's no point in checking whether it succeeds in a > sample program. svn path=/trunk/; revision=51334
2013-08-13 09:58:09 +00:00
${CMAKE_DL_LIBS}
From Jim Young, bug 7745. Add Makefile support for reordercap. svn path=/trunk/; revision=45090
2012-09-24 10:23:20 +00:00
)
set(reordercap_FILES
CMake: use object libraries to avoid redundant builds Some source files are duplicated via add_executable. Assuming that these are not affected by target-specific preprocessor macros, they can be built only once and shared among executables. In one configuration, this reduces the number of object files by 55 (cli_main.c and version_info.c alone were built 15 times each). Removes the version dependency from each target since the 'version_info' target can now declare this dependency. Remove CLEAN_C_FILES from extcap since it is not used to set -Werror. Due to removing some files from wireshark_FILES (and others), these are no longer part of checkAPIs though. Hopefully that is acceptable. Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58 Reviewed-on: https://code.wireshark.org/review/31509 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-12 11:43:18 +00:00
$<TARGET_OBJECTS:cli_main>
From Jim Young, bug 7745. Add Makefile support for reordercap. svn path=/trunk/; revision=45090
2012-09-24 10:23:20 +00:00
reordercap.c
)
Windows: Make our program details more consistent. Use a single template file for most of our program resources. Encode our resource files as UTF-8. Add resources to extcap/*.exe. Replace a regex with concatenation. Change-Id: I0ed49086618127ca4fdef69272f849d8f16e4dab Reviewed-on: https://code.wireshark.org/review/30088 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-08 23:34:39 +00:00
set_executable_resources(reordercap "Reordercap")
From Jim Young, bug 7745. Add Makefile support for reordercap. svn path=/trunk/; revision=45090
2012-09-24 10:23:20 +00:00
add_executable(reordercap ${reordercap_FILES})
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
set_extra_executable_properties(reordercap "Executables")
From Jim Young, bug 7745. Add Makefile support for reordercap. svn path=/trunk/; revision=45090
2012-09-24 10:23:20 +00:00
target_link_libraries(reordercap ${reordercap_LIBS})
CMake: Fix minimum version requirements for CentOS 8 target_link_options() requires CMake >= 3.13.
2021-09-21 18:15:09 +00:00
executable_link_mingw_unicode(reordercap)
From Jim Young, bug 7745. Add Makefile support for reordercap. svn path=/trunk/; revision=45090
2012-09-24 10:23:20 +00:00
install(TARGETS reordercap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
- Properly detect and use the perl command. - Rename EDITCAP_... to editcap_... and the like. This should make it easier to later loop around some of the entries instead of processing each individually. svn path=/trunk/; revision=28760
2009-06-16 05:52:16 +00:00
if(BUILD_capinfos)
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
set(capinfos_LIBS
Use the new cfile_XXX_failure_message() routines more broadly. Change-Id: I7814b3fd0353f4836ae61cbdbd4e13f659cbcb59 Reviewed-on: https://code.wireshark.org/review/21239 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-20 07:19:01 +00:00
ui
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
wiretap
capinfos needs libwsutil. Explicitely link against it. svn path=/trunk/; revision=45292
2012-10-03 17:31:23 +00:00
wsutil
Move version_info.[ch] to ui/ Version info is an aspect of UI implementation so move it to a more appropriate place, such as ui/. This also helps declutter the top-level. A static library is appropriate to encapsulate the dependencies as private and it is better supported by CMake than object libraries. Also version_info.h should not be installed as a public header.
2021-07-03 11:58:30 +00:00
version_info
Commit 32350 replaced the self written FindZ.cmake by cmakes FindZLIB.cmake. What it didn't do was do adapt the magic names that are derived from the name of the FindXXX.cmake script. Fix that. Also add $Id$ to the FindZLIB.cmake script. svn path=/trunk/; revision=32899
2010-05-19 13:05:35 +00:00
${ZLIB_LIBRARIES}
Added GCRYPT_LIBRARIES to capinfos. svn path=/trunk/; revision=31205
2009-12-08 11:04:52 +00:00
${GCRYPT_LIBRARIES}
Implement in cmake: http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=51322 > User: guy > Date: 2013/08/12 01:01 PM > > Log: > Just check whether dladdr() is available; we check in the code whether > it succeeds, so there's no point in checking whether it succeeds in a > sample program. svn path=/trunk/; revision=51334
2013-08-13 09:58:09 +00:00
${CMAKE_DL_LIBS}
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
)
set(capinfos_FILES
CMake: use object libraries to avoid redundant builds Some source files are duplicated via add_executable. Assuming that these are not affected by target-specific preprocessor macros, they can be built only once and shared among executables. In one configuration, this reduces the number of object files by 55 (cli_main.c and version_info.c alone were built 15 times each). Removes the version dependency from each target since the 'version_info' target can now declare this dependency. Remove CLEAN_C_FILES from extcap since it is not used to set -Werror. Due to removing some files from wireshark_FILES (and others), these are no longer part of checkAPIs though. Hopefully that is acceptable. Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58 Reviewed-on: https://code.wireshark.org/review/31509 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-12 11:43:18 +00:00
$<TARGET_OBJECTS:cli_main>
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
capinfos.c
)
Windows: Make our program details more consistent. Use a single template file for most of our program resources. Encode our resource files as UTF-8. Add resources to extcap/*.exe. Replace a regex with concatenation. Change-Id: I0ed49086618127ca4fdef69272f849d8f16e4dab Reviewed-on: https://code.wireshark.org/review/30088 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-08 23:34:39 +00:00
set_executable_resources(capinfos "Capinfos")
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
add_executable(capinfos ${capinfos_FILES})
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
set_extra_executable_properties(capinfos "Executables")
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
target_link_libraries(capinfos ${capinfos_LIBS})
CMake: Adjust wsutil includes and linking. Mark wsutil's includes SYSTEM PRIVATE. This exposed a lot of targets that were indirectly picking up include paths via the wsutil target, so add direct includes where needed. The G.722 and G.726 codecs were implicilty including tiffio.h; find it explicitly instead. Mark some of wsutil's libraries PRIVATE, but leave commonly-used ones PUBLIC. Ping #17477.
2021-07-13 18:02:52 +00:00
target_include_directories(capinfos SYSTEM PRIVATE ${GCRYPT_INCLUDE_DIRS})
CMake: Fix minimum version requirements for CentOS 8 target_link_options() requires CMake >= 3.13.
2021-09-21 18:15:09 +00:00
executable_link_mingw_unicode(capinfos)
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
install(TARGETS capinfos RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
We require CMake >= 2.6 so we don't have to repeat the expressions in endif() + friends svn path=/trunk/; revision=29589
2009-08-27 16:11:16 +00:00
endif()
Build the other tools that don't depend on libwireshark (editcap, capinfo, text2pcap, mergecap). svn path=/trunk/; revision=28759
2009-06-16 05:37:46 +00:00
Add a "captype" file that just reports the type of a capture file, based on what libwiretap thinks it is. Update some comments to reflect the death of the hack used to include (libwiretap) plugin support in programs not built with libwireshark. svn path=/trunk/; revision=54015
2013-12-13 02:59:16 +00:00
if(BUILD_captype)
set(captype_LIBS
Use the new cfile_XXX_failure_message() routines more broadly. Change-Id: I7814b3fd0353f4836ae61cbdbd4e13f659cbcb59 Reviewed-on: https://code.wireshark.org/review/21239 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-20 07:19:01 +00:00
ui
Add a "captype" file that just reports the type of a capture file, based on what libwiretap thinks it is. Update some comments to reflect the death of the hack used to include (libwiretap) plugin support in programs not built with libwireshark. svn path=/trunk/; revision=54015
2013-12-13 02:59:16 +00:00
wiretap
wsutil
Move version_info.[ch] to ui/ Version info is an aspect of UI implementation so move it to a more appropriate place, such as ui/. This also helps declutter the top-level. A static library is appropriate to encapsulate the dependencies as private and it is better supported by CMake than object libraries. Also version_info.h should not be installed as a public header.
2021-07-03 11:58:30 +00:00
version_info
Add a "captype" file that just reports the type of a capture file, based on what libwiretap thinks it is. Update some comments to reflect the death of the hack used to include (libwiretap) plugin support in programs not built with libwireshark. svn path=/trunk/; revision=54015
2013-12-13 02:59:16 +00:00
${ZLIB_LIBRARIES}
${CMAKE_DL_LIBS}
)
set(captype_FILES
CMake: use object libraries to avoid redundant builds Some source files are duplicated via add_executable. Assuming that these are not affected by target-specific preprocessor macros, they can be built only once and shared among executables. In one configuration, this reduces the number of object files by 55 (cli_main.c and version_info.c alone were built 15 times each). Removes the version dependency from each target since the 'version_info' target can now declare this dependency. Remove CLEAN_C_FILES from extcap since it is not used to set -Werror. Due to removing some files from wireshark_FILES (and others), these are no longer part of checkAPIs though. Hopefully that is acceptable. Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58 Reviewed-on: https://code.wireshark.org/review/31509 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-12 11:43:18 +00:00
$<TARGET_OBJECTS:cli_main>
Add a "captype" file that just reports the type of a capture file, based on what libwiretap thinks it is. Update some comments to reflect the death of the hack used to include (libwiretap) plugin support in programs not built with libwireshark. svn path=/trunk/; revision=54015
2013-12-13 02:59:16 +00:00
captype.c
)
Windows: Make our program details more consistent. Use a single template file for most of our program resources. Encode our resource files as UTF-8. Add resources to extcap/*.exe. Replace a regex with concatenation. Change-Id: I0ed49086618127ca4fdef69272f849d8f16e4dab Reviewed-on: https://code.wireshark.org/review/30088 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-08 23:34:39 +00:00
set_executable_resources(captype "Captype")
Add a "captype" file that just reports the type of a capture file, based on what libwiretap thinks it is. Update some comments to reflect the death of the hack used to include (libwiretap) plugin support in programs not built with libwireshark. svn path=/trunk/; revision=54015
2013-12-13 02:59:16 +00:00
add_executable(captype ${captype_FILES})
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
set_extra_executable_properties(captype "Executables")
Add a "captype" file that just reports the type of a capture file, based on what libwiretap thinks it is. Update some comments to reflect the death of the hack used to include (libwiretap) plugin support in programs not built with libwireshark. svn path=/trunk/; revision=54015
2013-12-13 02:59:16 +00:00
target_link_libraries(captype ${captype_LIBS})
CMake: Fix minimum version requirements for CentOS 8 target_link_options() requires CMake >= 3.13.
2021-09-21 18:15:09 +00:00
executable_link_mingw_unicode(captype)
Add a "captype" file that just reports the type of a capture file, based on what libwiretap thinks it is. Update some comments to reflect the death of the hack used to include (libwiretap) plugin support in programs not built with libwireshark. svn path=/trunk/; revision=54015
2013-12-13 02:59:16 +00:00
install(TARGETS captype RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
- Properly detect and use the perl command. - Rename EDITCAP_... to editcap_... and the like. This should make it easier to later loop around some of the entries instead of processing each individually. svn path=/trunk/; revision=28760
2009-06-16 05:52:16 +00:00
if(BUILD_editcap)
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
set(editcap_LIBS
editcap now uses stuff from libui. Change-Id: Ifa5cda67305682909559963ea5ce90cecc0c8e6e Reviewed-on: https://code.wireshark.org/review/21238 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-20 03:25:59 +00:00
ui
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
wiretap
Move version_info.[ch] to ui/ Version info is an aspect of UI implementation so move it to a more appropriate place, such as ui/. This also helps declutter the top-level. A static library is appropriate to encapsulate the dependencies as private and it is better supported by CMake than object libraries. Also version_info.h should not be installed as a public header.
2021-07-03 11:58:30 +00:00
version_info
Commit 32350 replaced the self written FindZ.cmake by cmakes FindZLIB.cmake. What it didn't do was do adapt the magic names that are derived from the name of the FindXXX.cmake script. Fix that. Also add $Id$ to the FindZLIB.cmake script. svn path=/trunk/; revision=32899
2010-05-19 13:05:35 +00:00
${ZLIB_LIBRARIES}
Rewrite dissectors to use Libgcrypt functions. As discussed on the mailinglist, rewriting dissectors to use Libgcrypt functions as Libgcrypt will be mandatory after change 20030. Removal of following functions: - crypt_md4 - crypt_rc4* - aes_cmac_encrypt_* - md5_* - sha1_* - sha256_* Further candidates: - aes_* - rijndael_* - ... Added functions: - ws_hmac_buffer Added const macros: - HASH_MD5_LENGTH - HASH_SHA1_LENGTH Changes on epan/crypt/* verified with captures from https://wiki.wireshark.org/HowToDecrypt802.11 Changes on packet-snmp.c and packet-radius.c verified with captures from https://wiki.wireshark.org/SampleCapture Changes on packet-tacacs.c verified with capture from http://ccie-in-3-months.blogspot.nl/2009/04/decoding-login-credentials-regardless.html Change-Id: Iea6ba2bf207cf0f1bf2117068fb1abcfeaafaa46 Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html Reviewed-on: https://code.wireshark.org/review/20095 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-13 18:31:26 +00:00
${GCRYPT_LIBRARIES}
Implement in cmake: http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=51322 > User: guy > Date: 2013/08/12 01:01 PM > > Log: > Just check whether dladdr() is available; we check in the code whether > it succeeds, so there's no point in checking whether it succeeds in a > sample program. svn path=/trunk/; revision=51334
2013-08-13 09:58:09 +00:00
${CMAKE_DL_LIBS}
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
)
set(editcap_FILES
CMake: use object libraries to avoid redundant builds Some source files are duplicated via add_executable. Assuming that these are not affected by target-specific preprocessor macros, they can be built only once and shared among executables. In one configuration, this reduces the number of object files by 55 (cli_main.c and version_info.c alone were built 15 times each). Removes the version dependency from each target since the 'version_info' target can now declare this dependency. Remove CLEAN_C_FILES from extcap since it is not used to set -Werror. Due to removing some files from wireshark_FILES (and others), these are no longer part of checkAPIs though. Hopefully that is acceptable. Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58 Reviewed-on: https://code.wireshark.org/review/31509 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-12 11:43:18 +00:00
$<TARGET_OBJECTS:cli_main>
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
editcap.c
)
Windows: Make our program details more consistent. Use a single template file for most of our program resources. Encode our resource files as UTF-8. Add resources to extcap/*.exe. Replace a regex with concatenation. Change-Id: I0ed49086618127ca4fdef69272f849d8f16e4dab Reviewed-on: https://code.wireshark.org/review/30088 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-08 23:34:39 +00:00
set_executable_resources(editcap "Editcap")
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
add_executable(editcap ${editcap_FILES})
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
set_extra_executable_properties(editcap "Executables")
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
target_link_libraries(editcap ${editcap_LIBS})
CMake: Adjust wsutil includes and linking. Mark wsutil's includes SYSTEM PRIVATE. This exposed a lot of targets that were indirectly picking up include paths via the wsutil target, so add direct includes where needed. The G.722 and G.726 codecs were implicilty including tiffio.h; find it explicitly instead. Mark some of wsutil's libraries PRIVATE, but leave commonly-used ones PUBLIC. Ping #17477.
2021-07-13 18:02:52 +00:00
target_include_directories(editcap SYSTEM PRIVATE ${GCRYPT_INCLUDE_DIRS})
CMake: Fix minimum version requirements for CentOS 8 target_link_options() requires CMake >= 3.13.
2021-09-21 18:15:09 +00:00
executable_link_mingw_unicode(editcap)
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
install(TARGETS editcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
We require CMake >= 2.6 so we don't have to repeat the expressions in endif() + friends svn path=/trunk/; revision=29589
2009-08-27 16:11:16 +00:00
endif()
Build the other tools that don't depend on libwireshark (editcap, capinfo, text2pcap, mergecap). svn path=/trunk/; revision=28759
2009-06-16 05:37:46 +00:00
Only build rawshark and dumpcap if we have libpcap svn path=/trunk/; revision=38780
2011-08-29 19:18:28 +00:00
if(BUILD_dumpcap AND PCAP_FOUND)
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
set(dumpcap_LIBS
Put pcapio.c into a writecap library, and use it. Change-Id: Ib89f345c072a38bc01f0513366a4bdae3bf6f08e Reviewed-on: https://code.wireshark.org/review/14615 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-24 20:00:07 +00:00
writecap
dumpcap failed to link - add glib2 and wsutil libraries to fix this. svn path=/trunk/; revision=35575
2011-01-18 17:49:41 +00:00
wsutil
Move utility routines for capturing into a libcaputils static library. Some of those routines are used only in dumpcap; others are used in TShark and Wireshark as well. Change-Id: I9d92483f2fcff57a7d8b6bf6bdf2870505d19fb7 Reviewed-on: https://code.wireshark.org/review/2841 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-04 07:24:02 +00:00
caputils
Move the filter file reading code to libui. It doesn't belong in libwireshark, as it doesn't affect dissection, but it *does* belong in libui, as it's helper code for the UIs. Change-Id: I8a5e0640a299a08e9ec1917dd253197438ebfdbc Reviewed-on: https://code.wireshark.org/review/20974 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-04-09 04:24:45 +00:00
ui
Move version_info.[ch] to ui/ Version info is an aspect of UI implementation so move it to a more appropriate place, such as ui/. This also helps declutter the top-level. A static library is appropriate to encapsulate the dependencies as private and it is better supported by CMake than object libraries. Also version_info.h should not be installed as a public header.
2021-07-03 11:58:30 +00:00
version_info
CMake: Warn if dumpcap cannot be built Change-Id: I4eff2e7b75f3dd896ebd63e50a83f90da6a910b6 Reviewed-on: https://code.wireshark.org/review/34606 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-09-22 12:35:27 +00:00
pcap::pcap
Make building with GeoIP, Python, Capabilities and c-ares actually work. svn path=/trunk/; revision=29870
2009-09-12 17:20:08 +00:00
${CAP_LIBRARIES}
Play catch up with recent configure.in changes: - Link dumpcap (and only dumpcap) against gthread - gtk/gsm_a_stat.c and gtk/menus.c are dirty when configured with UI_MANAGER=1 - Add support run "cmake ... -DWANT_PACKET_EDITOR=1 ..." svn path=/trunk/; revision=37103
2011-05-12 21:13:00 +00:00
${GTHREAD2_LIBRARIES}
Commit 32350 replaced the self written FindZ.cmake by cmakes FindZLIB.cmake. What it didn't do was do adapt the magic names that are derived from the name of the FindXXX.cmake script. Fix that. Also add $Id$ to the FindZLIB.cmake script. svn path=/trunk/; revision=32899
2010-05-19 13:05:35 +00:00
${ZLIB_LIBRARIES}
Link with CoreFoundation and SystemConfiguration and add cfuitils.c on OS X where needed. Dumpcap, rawshark and tshark don't appear to require Cocoa so remove it. svn path=/trunk/; revision=46144
2012-11-22 16:49:17 +00:00
${APPLE_CORE_FOUNDATION_LIBRARY}
${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
Windows: Modernize our WSAStartup usage. Make sure we link each application that calls WSAStartup with ws2_32.lib. Pass version 2.2 to WSAStartup. Wikipedia says it was introduced in 1996, so we should be OK. Ping-Bug: 15711 Change-Id: I431839e930e7c646669af7373789640b5180ec28 Reviewed-on: https://code.wireshark.org/review/33033 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Tomasz Moń <desowin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-04-30 22:48:06 +00:00
${WIN_WS2_32_LIBRARY}
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
)
set(dumpcap_FILES
CMake: use object libraries to avoid redundant builds Some source files are duplicated via add_executable. Assuming that these are not affected by target-specific preprocessor macros, they can be built only once and shared among executables. In one configuration, this reduces the number of object files by 55 (cli_main.c and version_info.c alone were built 15 times each). Removes the version dependency from each target since the 'version_info' target can now declare this dependency. Remove CLEAN_C_FILES from extcap since it is not used to set -Werror. Due to removing some files from wireshark_FILES (and others), these are no longer part of checkAPIs though. Hopefully that is acceptable. Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58 Reviewed-on: https://code.wireshark.org/review/31509 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-12 11:43:18 +00:00
$<TARGET_OBJECTS:capture_opts>
$<TARGET_OBJECTS:cli_main>
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
dumpcap.c
ringbuffer.c
sync_pipe_write.c
)
Windows: Make our program details more consistent. Use a single template file for most of our program resources. Encode our resource files as UTF-8. Add resources to extcap/*.exe. Replace a regex with concatenation. Change-Id: I0ed49086618127ca4fdef69272f849d8f16e4dab Reviewed-on: https://code.wireshark.org/review/30088 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-10-08 23:34:39 +00:00
set_executable_resources(dumpcap "Dumpcap" UNIQUE_RC)
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
add_executable(dumpcap ${dumpcap_FILES})
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
set_extra_executable_properties(dumpcap "Executables")
Beginnings of getting cmake to build stuff in epan. It's only beginnings, so epan is commented out in the subdirs statement. This is more a synch to avoid duplicate work and creating conflicting patches to the cmake stuff. svn path=/trunk/; revision=29666
2009-09-02 16:33:01 +00:00
target_link_libraries(dumpcap ${dumpcap_LIBS})
CMake: Fixup qtui's includes. Add ${MINIZIP_INCLUDE_DIRS} to qtui's includes instead of every target's. Make more includes SYSTEM PRIVATE.
2021-07-15 00:17:17 +00:00
target_include_directories(dumpcap SYSTEM PRIVATE ${ZLIB_INCLUDE_DIRS})
CMake: Fix minimum version requirements for CentOS 8 target_link_options() requires CMake >= 3.13.
2021-09-21 18:15:09 +00:00
executable_link_mingw_unicode(dumpcap)
Add option to specify special permissions for dumpcap during cmake phase: set(DUMPCAP_INSTALL_OPTION <val>) where val is one of "normal" "suid" "capabilities" Some things left to do: - Error out in cmake if setcap isn't found or libcap isn't found. - Move multivalue option handling into it's own macro (-file) with value checking svn path=/trunk/; revision=54840
2014-01-19 00:48:22 +00:00
install(TARGETS dumpcap
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
Add option to specify special permissions for dumpcap during cmake phase: set(DUMPCAP_INSTALL_OPTION <val>) where val is one of "normal" "suid" "capabilities" Some things left to do: - Error out in cmake if setcap isn't found or libcap isn't found. - Move multivalue option handling into it's own macro (-file) with value checking svn path=/trunk/; revision=54840
2014-01-19 00:48:22 +00:00
PERMISSIONS ${DUMPCAP_SETUID}
OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
CMake: Add dumpcap group option to installation Change-Id: I2718776a908ae5f9c6c475a110f9170b812b392d Reviewed-on: https://code.wireshark.org/review/29282 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-25 16:27:23 +00:00
if(ENABLE_DUMPCAP_GROUP)
install(CODE "execute_process(COMMAND chgrp ${DUMPCAP_INSTALL_GROUP} ${CMAKE_INSTALL_FULL_BINDIR}/dumpcap)")
install(CODE "execute_process(COMMAND chmod o-x ${CMAKE_INSTALL_FULL_BINDIR}/dumpcap)")
endif()
Add option to specify special permissions for dumpcap during cmake phase: set(DUMPCAP_INSTALL_OPTION <val>) where val is one of "normal" "suid" "capabilities" Some things left to do: - Error out in cmake if setcap isn't found or libcap isn't found. - Move multivalue option handling into it's own macro (-file) with value checking svn path=/trunk/; revision=54840
2014-01-19 00:48:22 +00:00
if(DUMPCAP_INSTALL_OPTION STREQUAL "capabilities")
install( CODE "execute_process(
COMMAND
${SETCAP_EXECUTABLE}
cap_net_raw,cap_net_admin+ep
${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/dumpcap${CMAKE_EXECUTABLE_SUFFIX}
RESULT_VARIABLE
_SETCAP_RESULT
)
if( _SETCAP_RESULT )
Error doesn't exist, use warning instead. svn path=/trunk/; revision=54841
2014-01-19 01:08:52 +00:00
message( WARNING \"setcap failed (${_SETCAP_RESULT}).\")
Add option to specify special permissions for dumpcap during cmake phase: set(DUMPCAP_INSTALL_OPTION <val>) where val is one of "normal" "suid" "capabilities" Some things left to do: - Error out in cmake if setcap isn't found or libcap isn't found. - Move multivalue option handling into it's own macro (-file) with value checking svn path=/trunk/; revision=54840
2014-01-19 00:48:22 +00:00
endif()"
)
endif()
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
if(BUILD_logray AND ENABLE_APPLICATION_BUNDLE)
CMake: Make sure Logwolf includes dumpcap on macOS. Copy dumpcap into Logwolf's application bundle.
2022-04-06 16:08:12 +00:00
add_custom_command(TARGET dumpcap POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
$<TARGET_FILE:dumpcap> run/Logray.app/Contents/MacOS/dumpcap
CMake: Make sure Logwolf includes dumpcap on macOS. Copy dumpcap into Logwolf's application bundle.
2022-04-06 16:08:12 +00:00
)
endif()
CMake: Warn if dumpcap cannot be built Change-Id: I4eff2e7b75f3dd896ebd63e50a83f90da6a910b6 Reviewed-on: https://code.wireshark.org/review/34606 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-09-22 12:35:27 +00:00
elseif(BUILD_dumpcap AND ENABLE_PCAP)
message(WARNING "Dumpcap was requested but libpcap dependency is not available. "
"Wireshark will be built without packet capture capability.")
We require CMake >= 2.6 so we don't have to repeat the expressions in endif() + friends svn path=/trunk/; revision=29589
2009-08-27 16:11:16 +00:00
endif()
CMake: - Add opcua to the list of plugins to build - Link the gtk stuff statically into wireshark - Beginnings of "make install" - Change a few things about install paths svn path=/trunk/; revision=30029
2009-09-21 00:19:07 +00:00
Sync some CMake and Autotools install behaviors. Adjust the following CMake and Autotools behaviors in order to synchronize their respective install behaviors: - Disable tfshark by default in CMakeOptions.txt - Add profiles/Bluetooth/preferences to Makefile.am - Add missing captype and ciscodump entries to doc/Makefile.am - Install help/faq.txt on all platforms in CMakeLists.txt - Add BUILD_corbaidl2wrs, BUILD_dcerpcidl2wrs, and BUILD_xxx2deb options to CMake and use them to adjust the corresponding parts of the build. - Pull the DCERPC idl2wrs build steps into the top-level CMakeLists.txt. This change doesn't sync everything. Some installed content still diverges, including the following: - CMake installs a bunch of modules into lib/wireshark: FindGLIB2.cmake FindWireshark.cmake FindWSWinLibs.cmake LocatePythonModule.cmake UseAsn2Wrs.cmake UseMakeDissectorReg.cmake WiresharkConfig.cmake WiresharkConfigVersion.cmake Do we need any or all of these? If so, should the Autotools behavior be synced accordingly? - Autotools installs libtool .la files. It also installs wireshark-gtk.desktop unconditionally. Change-Id: I7846efe08f7139c31b6ceca6f08a1fa5168b3e22 Reviewed-on: https://code.wireshark.org/review/23041 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-10 17:20:30 +00:00
# We have two idl2wrs utilities: this and the CORBA version in tools.
# We probably shouldn't do that.
if(BUILD_dcerpcidl2wrs)
set(idl2wrs_LIBS
wsutil
)
set(idl2wrs_FILES
epan/dissectors/dcerpc/idl2wrs.c
)
add_executable(idl2wrs ${idl2wrs_FILES})
set_target_properties(idl2wrs PROPERTIES FOLDER "Executables")
set_extra_executable_properties(idl2wrs "Executables")
target_link_libraries(idl2wrs ${idl2wrs_LIBS})
install(TARGETS idl2wrs RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
CMake: Add a top-level nsis_package target. Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include file. Add macros to generate packaging-related targets and invoke them from the top-level CMakeLists.txt. Add a top-level "plugins" target. Copy plugins to "plugins" in each of our staging directories instead of "plugins/$VERSION". Add missing files to the copy_data_files and copy_cli_dlls targets. Add all files in the NSIS package from the staging directory. Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT. Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa Reviewed-on: https://code.wireshark.org/review/6459 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
if (WIN32)
CMake+PortableApps: Include the VC runtime (second try). Move the code that finds the Visual C++ redistributable DLLs to its own module. Run it before we create our NSIS and PortableApps targets. Add a PortableApps target that copies the redistributable This reverts commit 403fa9fbe0cdba3f443ec4674cda40092525ffe4. Bug: 11800 Change-Id: I081d8fd3f5f37dd590659ca8f2bd309642a9a9df Reviewed-on: https://code.wireshark.org/review/12431 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 5b580834aeeee8477039bc099c49c21aeeb3b71f) Reviewed-on: https://code.wireshark.org/review/12432 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-12-04 17:02:35 +00:00
find_package( MSVC_REDIST )
CMake: Add a top-level nsis_package target. Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include file. Add macros to generate packaging-related targets and invoke them from the top-level CMakeLists.txt. Add a top-level "plugins" target. Copy plugins to "plugins" in each of our staging directories instead of "plugins/$VERSION". Add missing files to the copy_data_files and copy_cli_dlls targets. Add all files in the NSIS package from the staging directory. Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT. Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa Reviewed-on: https://code.wireshark.org/review/6459 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
# Must come after executable targets are defined.
find_package( NSIS )
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
if(MAKENSIS_EXECUTABLE)
CMake: Add a top-level nsis_package target. Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include file. Add macros to generate packaging-related targets and invoke them from the top-level CMakeLists.txt. Add a top-level "plugins" target. Copy plugins to "plugins" in each of our staging directories instead of "plugins/$VERSION". Add missing files to the copy_data_files and copy_cli_dlls targets. Add all files in the NSIS package from the staging directory. Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT. Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa Reviewed-on: https://code.wireshark.org/review/6459 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
add_subdirectory( packaging/nsis EXCLUDE_FROM_ALL )
NSIS: Update some target and filenames. Rename the following build targets, similar to the recent macOS target name changes: nsis_package_prep to wireshark_nsis_prep nsis_package to wireshark_nsis Rename some NSIS files to reflect that they're specific to Wireshark. Update the documentation and CI configurations.
2022-06-02 22:07:09 +00:00
ADD_NSIS_UNINSTALLER_TARGETS()
ADD_NSIS_PACKAGE_TARGETS()
CMake: Add a top-level nsis_package target. Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include file. Add macros to generate packaging-related targets and invoke them from the top-level CMakeLists.txt. Add a top-level "plugins" target. Copy plugins to "plugins" in each of our staging directories instead of "plugins/$VERSION". Add missing files to the copy_data_files and copy_cli_dlls targets. Add all files in the NSIS package from the staging directory. Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT. Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa Reviewed-on: https://code.wireshark.org/review/6459 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
endif()
CMake: Initial PortableApps targets. Add portableapps_app_dir and portableapps_package targets. Change-Id: Ifea3d952eef0e267de6364999d45807236d99102 Reviewed-on: https://code.wireshark.org/review/8025 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-07 19:55:42 +00:00
Create a Wix Installer This is intended to replace the NSIS installer for Windows. It does not include installing WinPcap or USBPcap. From the research I've done, it seems to make more sense to "bundle" them with Wix ("wrapper" installer that would include Wireshark, WinPcap and USBPcap installers together) TODO: 1. Customize installer with Wireshark graphics 2. Better handling flexibility of installing VC CRT Merge module (need build script to provide appropriate macros). Something like (or modifying existing) FindMSVC_REDIST.cmake. 3. Use Wireshark UpgradeProductCode for install/uninstall. Previous NSIS installer did not have an upgrade code, so there are some backwards compatibility concerns. 4. Uninstall considerations (removing whole directories - plugins, configuration profiles?). NSIS needed to do more things "manually" than Wix does by default. Need to merge as best as possible to handle backwards compatibility. Many thanks to Brian Pratt for all the Wix help. Change-Id: Ib50780214fc7707ba2a46fd96ba8797a1763fa0c Reviewed-on: https://code.wireshark.org/review/14858 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-07 23:03:51 +00:00
find_package( WiX )
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
if(WIX_CANDLE_EXECUTABLE)
Create a Wix Installer This is intended to replace the NSIS installer for Windows. It does not include installing WinPcap or USBPcap. From the research I've done, it seems to make more sense to "bundle" them with Wix ("wrapper" installer that would include Wireshark, WinPcap and USBPcap installers together) TODO: 1. Customize installer with Wireshark graphics 2. Better handling flexibility of installing VC CRT Merge module (need build script to provide appropriate macros). Something like (or modifying existing) FindMSVC_REDIST.cmake. 3. Use Wireshark UpgradeProductCode for install/uninstall. Previous NSIS installer did not have an upgrade code, so there are some backwards compatibility concerns. 4. Uninstall considerations (removing whole directories - plugins, configuration profiles?). NSIS needed to do more things "manually" than Wix does by default. Need to merge as best as possible to handle backwards compatibility. Many thanks to Brian Pratt for all the Wix help. Change-Id: Ib50780214fc7707ba2a46fd96ba8797a1763fa0c Reviewed-on: https://code.wireshark.org/review/14858 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-04-07 23:03:51 +00:00
add_subdirectory( packaging/wix EXCLUDE_FROM_ALL )
ADD_WIX_PACKAGE_TARGET()
endif()
CMake: Initial PortableApps targets. Add portableapps_app_dir and portableapps_package targets. Change-Id: Ifea3d952eef0e267de6364999d45807236d99102 Reviewed-on: https://code.wireshark.org/review/8025 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-07 19:55:42 +00:00
find_package( PortableApps )
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
if(PORTABLEAPPS_LAUNCHER_GENERATOR_EXECUTABLE AND PORTABLEAPPS_INSTALLER_EXECUTABLE)
CMake: Initial PortableApps targets. Add portableapps_app_dir and portableapps_package targets. Change-Id: Ifea3d952eef0e267de6364999d45807236d99102 Reviewed-on: https://code.wireshark.org/review/8025 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-07 19:55:42 +00:00
add_subdirectory( packaging/portableapps EXCLUDE_FROM_ALL )
ADD_PORTABLEAPPS_PACKAGE_TARGET()
endif()
CMake: Add a top-level nsis_package target. Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include file. Add macros to generate packaging-related targets and invoke them from the top-level CMakeLists.txt. Add a top-level "plugins" target. Copy plugins to "plugins" in each of our staging directories instead of "plugins/$VERSION". Add missing files to the copy_data_files and copy_cli_dlls targets. Add all files in the NSIS package from the staging directory. Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT. Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa Reviewed-on: https://code.wireshark.org/review/6459 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-06 23:07:50 +00:00
endif()
Transition from GeoIP Legacy to MaxMindDB. MaxMind is discontinuing its legacy databases in April in favor of GeoIP2, which use a newer database format (MaxMind DB). The reference C library (libmaxminddb) is available under the Apache 2.0 license which isn't quite compatible with ours. Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin and prints resolved information on stdout. Place it under a liberal license (MIT) so that we can keep libmaxminddb at arm's length. Add epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it via stdio. Migrate the preferences and documentation to MaxMindDB. Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the geographic coordinate fields to FT_DOUBLEs. Bug: 10658 Change-Id: I24aeed637bea1b41d173270bda413af230f4425f Reviewed-on: https://code.wireshark.org/review/26214 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-09 01:20:26 +00:00
if (MAXMINDDB_FOUND)
set(mmdbresolve_LIBS
# Note: libmaxminddb is not GPL-2 compatible.
${MAXMINDDB_LIBRARY}
Windows: Upgrade brotli, libmaxminddb, lz4, and snappy. Upgrade brotli to 1.0.9, libmaxminddb to 1.4.3, lz4 to 1.9.2, and snappy to 1.1.8.
2020-11-30 22:57:01 +00:00
# Needed for CMake-built libmaxminddb.lib <= 1.43.
${WIN_WS2_32_LIBRARY}
Transition from GeoIP Legacy to MaxMindDB. MaxMind is discontinuing its legacy databases in April in favor of GeoIP2, which use a newer database format (MaxMind DB). The reference C library (libmaxminddb) is available under the Apache 2.0 license which isn't quite compatible with ours. Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin and prints resolved information on stdout. Place it under a liberal license (MIT) so that we can keep libmaxminddb at arm's length. Add epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it via stdio. Migrate the preferences and documentation to MaxMindDB. Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the geographic coordinate fields to FT_DOUBLEs. Bug: 10658 Change-Id: I24aeed637bea1b41d173270bda413af230f4425f Reviewed-on: https://code.wireshark.org/review/26214 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-09 01:20:26 +00:00
)
set(mmdbresolve_FILES
mmdbresolve.c
)
win/cmake: missing rc files to set icon and copyright Closes #17761
2021-12-12 21:11:17 +00:00
set_executable_resources(mmdbresolve "Mmdbresolve")
Transition from GeoIP Legacy to MaxMindDB. MaxMind is discontinuing its legacy databases in April in favor of GeoIP2, which use a newer database format (MaxMind DB). The reference C library (libmaxminddb) is available under the Apache 2.0 license which isn't quite compatible with ours. Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin and prints resolved information on stdout. Place it under a liberal license (MIT) so that we can keep libmaxminddb at arm's length. Add epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it via stdio. Migrate the preferences and documentation to MaxMindDB. Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the geographic coordinate fields to FT_DOUBLEs. Bug: 10658 Change-Id: I24aeed637bea1b41d173270bda413af230f4425f Reviewed-on: https://code.wireshark.org/review/26214 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-09 01:20:26 +00:00
add_executable(mmdbresolve ${mmdbresolve_FILES})
set_extra_executable_properties(mmdbresolve "Executables")
target_link_libraries(mmdbresolve ${mmdbresolve_LIBS})
CMake: Replace PACKAGELIST magic This is more explicit and easier to read with slightly better locality while using less code. Also less awkward when the package doesn't fit the narrow package list expectations. The ws_find_package() macro doesn't include all the status messages. The choice was to rely on standard find_package() and feature_summary() output and be less verbose. Avoid polluting the CLI build interface. Per target include paths and macro definitions are preferred. Because this patch intentionally removes the global CMAKE_*_FLAGS and include_directories() usage in favor of target properties, some untested build configurations may inadvertently break because of missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This required a manual review of dependencies that might have been incomplete. ${PACKAGE_VAR}_LINK_FLAGS seems to be unused. Changing the CMake Qt code to use more modern CMake component syntax is left as future work. Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78 Reviewed-on: https://code.wireshark.org/review/31496 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10 01:45:00 +00:00
target_include_directories(mmdbresolve PUBLIC ${MAXMINDDB_INCLUDE_DIRS})
target_compile_definitions(mmdbresolve PUBLIC ${MAXMINDDB_DEFINITIONS})
Transition from GeoIP Legacy to MaxMindDB. MaxMind is discontinuing its legacy databases in April in favor of GeoIP2, which use a newer database format (MaxMind DB). The reference C library (libmaxminddb) is available under the Apache 2.0 license which isn't quite compatible with ours. Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin and prints resolved information on stdout. Place it under a liberal license (MIT) so that we can keep libmaxminddb at arm's length. Add epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it via stdio. Migrate the preferences and documentation to MaxMindDB. Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the geographic coordinate fields to FT_DOUBLEs. Bug: 10658 Change-Id: I24aeed637bea1b41d173270bda413af230f4425f Reviewed-on: https://code.wireshark.org/review/26214 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-09 01:20:26 +00:00
install(TARGETS mmdbresolve RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
CMake+packaging: Add a logwolf_app_bundle target. Add a logwolf_app_bundle target and update osx-app.sh to handle different application bundle names.
2022-02-28 22:04:09 +00:00
if(ENABLE_APPLICATION_BUNDLE AND BUILD_wireshark)
CMake+macOS: Explicitly create the extra package directory. Create Wireshark.app/Contents/Resources/Extras, which is needed by the Makefile generator.
2020-10-16 20:37:27 +00:00
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/run/${CMAKE_CFG_INTDIR}/Wireshark.app/Contents/Resources/Extras")
macOS: Sign the ChmodBPF script. Add macosx/osx-extras.sh, which can be used to sign the ChmodBPF script. Bug: 15782 Change-Id: I9929dd6db067f8bc1097faac28ab9467f5a89a82 Reviewed-on: https://code.wireshark.org/review/35481 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-12-18 00:25:10 +00:00
# --preserve-xattr is undocumented but ensures that we install
# a signed ChmodBPF script.
macOS: Make Wireshark.app drag-installable. Create ChmodBPF installer and uninstaller packages using pkgbuild and productbuild. Place them in Wireshark.app/Resources/Extras. Add a path_helper installer and uninstaller which respectively add and remove /etc/*paths.d/Wireshark. Remove the PackageMaker and utility-launcher assets and build targets. Show a message in the main welcome screen if we don't have capture permissions. Add an link which launches the ChmodBPF installer. Add a "macOS Extras" item to About → Folders. Migrate "Read me first" from RTF to Asciidoctor, which lets us add links and looks like our other documentation. Rename dmg_set_style.scpt to arrange_dmg.applescript and make it plain text. Always run it in osx-dmg.sh. Bug: 6991 Bug: 12593 Bug: 11399 Ping-Bug: 16074 Change-Id: I7b6aa89aae2be522b4141b0d44e8142dec749e90 Reviewed-on: https://code.wireshark.org/review/31047 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-12 00:26:51 +00:00
set (install_chmodbpf_component_pkg "${CMAKE_BINARY_DIR}/install.ChmodBPF.pkg")
add_custom_command(OUTPUT "${install_chmodbpf_component_pkg}"
macOS: Explicitly set our package root permissions. The pkgbuild man page doesn't really discuss file permissions[1], but it appears that it simply preserves them. Make sure the ChmodBPF and path_helper roots have the correct permssions before building their respective installers. [1] The --ownership flag description mentions chmod but that appears to be a typo. Bug: 16284 Change-Id: I5ef277539a5b2015394ae3e722ef4c176f9c243f Reviewed-on: https://code.wireshark.org/review/35507 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-12-19 16:58:35 +00:00
COMMAND find
"${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF/root"
-type d
-exec chmod 755 "{}" +
COMMAND chmod 644
"${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF/root/Library/LaunchDaemons/org.wireshark.ChmodBPF.plist"
COMMAND chmod 755
"${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF/root/Library/Application Support/Wireshark/ChmodBPF/ChmodBPF"
macOS: More ChmodBPF signing updates. Run osx-extras.sh before building the ChmodBPF installer package. Change-Id: Iec3f88da86e48b5aac385369c7e68f23babc4c34 Reviewed-on: https://code.wireshark.org/review/35491 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-12-18 17:33:23 +00:00
COMMAND "${CMAKE_SOURCE_DIR}/packaging/macosx/osx-extras.sh"
macOS: Make Wireshark.app drag-installable. Create ChmodBPF installer and uninstaller packages using pkgbuild and productbuild. Place them in Wireshark.app/Resources/Extras. Add a path_helper installer and uninstaller which respectively add and remove /etc/*paths.d/Wireshark. Remove the PackageMaker and utility-launcher assets and build targets. Show a message in the main welcome screen if we don't have capture permissions. Add an link which launches the ChmodBPF installer. Add a "macOS Extras" item to About → Folders. Migrate "Read me first" from RTF to Asciidoctor, which lets us add links and looks like our other documentation. Rename dmg_set_style.scpt to arrange_dmg.applescript and make it plain text. Always run it in osx-dmg.sh. Bug: 6991 Bug: 12593 Bug: 11399 Ping-Bug: 16074 Change-Id: I7b6aa89aae2be522b4141b0d44e8142dec749e90 Reviewed-on: https://code.wireshark.org/review/31047 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-12 00:26:51 +00:00
COMMAND pkgbuild
--identifier org.wireshark.ChmodBPF.pkg
--version 1.1
macOS: Sign the ChmodBPF script. Add macosx/osx-extras.sh, which can be used to sign the ChmodBPF script. Bug: 15782 Change-Id: I9929dd6db067f8bc1097faac28ab9467f5a89a82 Reviewed-on: https://code.wireshark.org/review/35481 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-12-18 00:25:10 +00:00
--preserve-xattr
macOS: Make Wireshark.app drag-installable. Create ChmodBPF installer and uninstaller packages using pkgbuild and productbuild. Place them in Wireshark.app/Resources/Extras. Add a path_helper installer and uninstaller which respectively add and remove /etc/*paths.d/Wireshark. Remove the PackageMaker and utility-launcher assets and build targets. Show a message in the main welcome screen if we don't have capture permissions. Add an link which launches the ChmodBPF installer. Add a "macOS Extras" item to About → Folders. Migrate "Read me first" from RTF to Asciidoctor, which lets us add links and looks like our other documentation. Rename dmg_set_style.scpt to arrange_dmg.applescript and make it plain text. Always run it in osx-dmg.sh. Bug: 6991 Bug: 12593 Bug: 11399 Ping-Bug: 16074 Change-Id: I7b6aa89aae2be522b4141b0d44e8142dec749e90 Reviewed-on: https://code.wireshark.org/review/31047 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-12 00:26:51 +00:00
--root "${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF/root"
--scripts "${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF/install-scripts"
${install_chmodbpf_component_pkg}
DEPENDS
"${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF/root/Library/Application Support/Wireshark/ChmodBPF/ChmodBPF"
"${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF/root/Library/LaunchDaemons/org.wireshark.ChmodBPF.plist"
"${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF/install-scripts/postinstall"
)
set (install_chmodbpf_pkg "${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Resources/Extras/Install ChmodBPF.pkg")
add_custom_command(OUTPUT "${install_chmodbpf_pkg}"
COMMAND productbuild
--identifier org.wireshark.install.ChmodBPF.product
--version 1.1
--distribution "${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF/install-distribution.xml"
--package-path "${CMAKE_BINARY_DIR}"
${install_chmodbpf_pkg}
DEPENDS
"${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF/install-distribution.xml"
${install_chmodbpf_component_pkg}
)
set (uninstall_chmodbpf_component_pkg "${CMAKE_BINARY_DIR}/uninstall.ChmodBPF.pkg")
add_custom_command(OUTPUT "${uninstall_chmodbpf_component_pkg}"
COMMAND pkgbuild
--identifier org.wireshark.uninstall.ChmodBPF.pkg
--version 1.1
--nopayload
--scripts "${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF/uninstall-scripts"
${uninstall_chmodbpf_component_pkg}
DEPENDS
"${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF/uninstall-scripts/postinstall"
)
set (uninstall_chmodbpf_pkg "${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Resources/Extras/Uninstall ChmodBPF.pkg")
add_custom_command(OUTPUT "${uninstall_chmodbpf_pkg}"
COMMAND productbuild
--identifier org.wireshark.uninstall.ChmodBPF.product
--version 1.1
--distribution "${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF/uninstall-distribution.xml"
--package-path "${CMAKE_BINARY_DIR}"
${uninstall_chmodbpf_pkg}
DEPENDS
"${CMAKE_SOURCE_DIR}/packaging/macosx/ChmodBPF/uninstall-distribution.xml"
${uninstall_chmodbpf_component_pkg}
)
add_custom_target(chmodbpf DEPENDS ${install_chmodbpf_pkg} ${uninstall_chmodbpf_pkg})
set (install_path_helper_component_pkg "${CMAKE_BINARY_DIR}/install.path_helper.pkg")
add_custom_command(OUTPUT "${install_path_helper_component_pkg}"
macOS: Explicitly set our package root permissions. The pkgbuild man page doesn't really discuss file permissions[1], but it appears that it simply preserves them. Make sure the ChmodBPF and path_helper roots have the correct permssions before building their respective installers. [1] The --ownership flag description mentions chmod but that appears to be a typo. Bug: 16284 Change-Id: I5ef277539a5b2015394ae3e722ef4c176f9c243f Reviewed-on: https://code.wireshark.org/review/35507 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-12-19 16:58:35 +00:00
COMMAND find
"${CMAKE_SOURCE_DIR}/packaging/macosx/path_helper/root"
-type d
-exec chmod 755 "{}" +
COMMAND find
"${CMAKE_SOURCE_DIR}/packaging/macosx/path_helper/root"
-type f
-exec chmod 644 "{}" +
macOS: Make Wireshark.app drag-installable. Create ChmodBPF installer and uninstaller packages using pkgbuild and productbuild. Place them in Wireshark.app/Resources/Extras. Add a path_helper installer and uninstaller which respectively add and remove /etc/*paths.d/Wireshark. Remove the PackageMaker and utility-launcher assets and build targets. Show a message in the main welcome screen if we don't have capture permissions. Add an link which launches the ChmodBPF installer. Add a "macOS Extras" item to About → Folders. Migrate "Read me first" from RTF to Asciidoctor, which lets us add links and looks like our other documentation. Rename dmg_set_style.scpt to arrange_dmg.applescript and make it plain text. Always run it in osx-dmg.sh. Bug: 6991 Bug: 12593 Bug: 11399 Ping-Bug: 16074 Change-Id: I7b6aa89aae2be522b4141b0d44e8142dec749e90 Reviewed-on: https://code.wireshark.org/review/31047 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-12 00:26:51 +00:00
COMMAND pkgbuild
--identifier org.wireshark.path_helper.pkg
--version 1.0
--root "${CMAKE_SOURCE_DIR}/packaging/macosx/path_helper/root/etc"
--install-location /private/etc
${install_path_helper_component_pkg}
DEPENDS
"${CMAKE_SOURCE_DIR}/packaging/macosx/path_helper/root/etc/paths.d/Wireshark"
"${CMAKE_SOURCE_DIR}/packaging/macosx/path_helper/root/etc/manpaths.d/Wireshark"
)
set (install_path_helper_pkg "${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Resources/Extras/Add Wireshark to the system path.pkg")
add_custom_command(OUTPUT "${install_path_helper_pkg}"
COMMAND productbuild
--identifier org.wireshark.install.path_helper.product
--version 1.0
--distribution "${CMAKE_SOURCE_DIR}/packaging/macosx/path_helper/install-distribution.xml"
--package-path "${CMAKE_BINARY_DIR}"
${install_path_helper_pkg}
DEPENDS
"${CMAKE_SOURCE_DIR}/packaging/macosx/path_helper/install-distribution.xml"
${install_path_helper_component_pkg}
)
set (uninstall_path_helper_component_pkg "${CMAKE_BINARY_DIR}/uninstall.path_helper.pkg")
add_custom_command(OUTPUT "${uninstall_path_helper_component_pkg}"
COMMAND pkgbuild
--identifier org.wireshark.uninstall.path_helper.pkg
--version 1.0
--nopayload
--scripts "${CMAKE_SOURCE_DIR}/packaging/macosx/path_helper/uninstall-scripts"
${uninstall_path_helper_component_pkg}
DEPENDS
"${CMAKE_SOURCE_DIR}/packaging/macosx/path_helper/uninstall-scripts/postinstall"
)
set (uninstall_path_helper_pkg "${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Resources/Extras/Remove Wireshark from the system path.pkg")
add_custom_command(OUTPUT "${uninstall_path_helper_pkg}"
COMMAND productbuild
--identifier org.wireshark.uninstall.path_helper.product
--version 1.0
--distribution "${CMAKE_SOURCE_DIR}/packaging/macosx/path_helper/uninstall-distribution.xml"
--package-path "${CMAKE_BINARY_DIR}"
${uninstall_path_helper_pkg}
DEPENDS
${CMAKE_SOURCE_DIR}/packaging/macosx/path_helper/uninstall-distribution.xml
${uninstall_path_helper_component_pkg}
)
add_custom_target(path_helper DEPENDS ${install_path_helper_pkg} ${uninstall_path_helper_pkg})
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
add_custom_target(wireshark_app_bundle)
set_target_properties(wireshark_app_bundle PROPERTIES FOLDER "Copy Tasks")
add_custom_command(TARGET wireshark_app_bundle
CMake: Build a complete application bundle on OS X. Run osx-app.sh by default on OS X. Aside from giving us a fully portable application bundle after building this should let us clear our library path at startup should the need arise. Change the name of the osx-app target to app_bundle. Search ../Frameworks before ../lib. Create PkgInfo at configure time instead of compile time. Build our program list as we go. Change-Id: If5511ee921108b1c079cef67026eac9e47211be1 Reviewed-on: https://code.wireshark.org/review/6896 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-01 21:56:39 +00:00
POST_BUILD
Make osx-app.sh a configured file and remove Autotools targets. Rename osx-app.sh to osx-app.sh.in and add the version to the plugin path at configure time. Instead up updating Autotools accordingly just remove the macOS packaging targets. gf61c381b5a removed support for Autotools in osx-app.sh and if anyone wants to build macOS packages I'd prefer that they use the same toolchain as the buildbot. Change-Id: Ide5205265bf8859a85b1afab68fa8f8285952bd3 Reviewed-on: https://code.wireshark.org/review/23839 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-04 23:27:08 +00:00
COMMAND "${CMAKE_BINARY_DIR}/packaging/macosx/osx-app.sh"
CMake: Build a complete application bundle on OS X. Run osx-app.sh by default on OS X. Aside from giving us a fully portable application bundle after building this should let us clear our library path at startup should the need arise. Change the name of the osx-app target to app_bundle. Search ../Frameworks before ../lib. Create PkgInfo at configure time instead of compile time. Build our program list as we go. Change-Id: If5511ee921108b1c079cef67026eac9e47211be1 Reviewed-on: https://code.wireshark.org/review/6896 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-01 21:56:39 +00:00
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/run"
)
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
add_dependencies(wireshark_app_bundle ${PROGLIST} chmodbpf path_helper)
OS X: Integrate CMake and osx-dmg.sh Change-Id: Ide608f5e73ecd40c67a6b1c0e16f11233cd49c9d Reviewed-on: https://code.wireshark.org/review/10694 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-23 17:57:45 +00:00
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
add_custom_target(wireshark_dmg_prep DEPENDS wireshark_app_bundle)
macOS: Make the dmg_package target fail noisily. Change-Id: I479c9f13b9695d78d47b698a14cda0989724c639 Reviewed-on: https://code.wireshark.org/review/36270 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-03-03 16:28:39 +00:00
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
FILE(MAKE_DIRECTORY packaging/macosx/wireshark)
set(_wireshark_read_me_first "packaging/macosx/wireshark/Read me first.html")
macOS: Make the dmg_package target fail noisily. Change-Id: I479c9f13b9695d78d47b698a14cda0989724c639 Reviewed-on: https://code.wireshark.org/review/36270 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-03-03 16:28:39 +00:00
ADD_CUSTOM_COMMAND(
OUTPUT
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
${_wireshark_read_me_first}
macOS: Make the dmg_package target fail noisily. Change-Id: I479c9f13b9695d78d47b698a14cda0989724c639 Reviewed-on: https://code.wireshark.org/review/36270 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-03-03 16:28:39 +00:00
COMMAND ${ASCIIDOCTOR_EXECUTABLE}
--backend html
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
--out-file ${_wireshark_read_me_first}
macOS: Make the dmg_package target fail noisily. Change-Id: I479c9f13b9695d78d47b698a14cda0989724c639 Reviewed-on: https://code.wireshark.org/review/36270 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-03-03 16:28:39 +00:00
--attribute include-dir=${CMAKE_SOURCE_DIR}/docbook
--attribute min-macos-version=${MIN_MACOS_VERSION}
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Wireshark_read_me_first.adoc
macOS: Make the dmg_package target fail noisily. Change-Id: I479c9f13b9695d78d47b698a14cda0989724c639 Reviewed-on: https://code.wireshark.org/review/36270 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-03-03 16:28:39 +00:00
DEPENDS
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Wireshark_read_me_first.adoc
macOS: Make the dmg_package target fail noisily. Change-Id: I479c9f13b9695d78d47b698a14cda0989724c639 Reviewed-on: https://code.wireshark.org/review/36270 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-03-03 16:28:39 +00:00
)
Packaging: Ship macOS dSYMs in their own .dmg. Create a Wireshark.dSYM bundle for our debugging symbols. Create a separate .dmg for the dSYM bundle, similar to what we do for Windows. `dwarfdump --uuid run/Wireshark.dSYM` returns what app This reduces the size of the application bundle and .dmg quite a bit (sizes measured with `du -sm`): 51 Wireshark 3.7.0 Intel 64.dmg 81 Wireshark dSYM 3.7.0 Intel 64.dmg 182 Wireshark.app 262 Wireshark.dSYM
2022-02-26 23:14:36 +00:00
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
set(_wireshark_dsym_installation "packaging/macosx/wireshark/Debugging symbols installation.html")
Packaging: Ship macOS dSYMs in their own .dmg. Create a Wireshark.dSYM bundle for our debugging symbols. Create a separate .dmg for the dSYM bundle, similar to what we do for Windows. `dwarfdump --uuid run/Wireshark.dSYM` returns what app This reduces the size of the application bundle and .dmg quite a bit (sizes measured with `du -sm`): 51 Wireshark 3.7.0 Intel 64.dmg 81 Wireshark dSYM 3.7.0 Intel 64.dmg 182 Wireshark.app 262 Wireshark.dSYM
2022-02-26 23:14:36 +00:00
ADD_CUSTOM_COMMAND(
OUTPUT
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
${_wireshark_dsym_installation}
Packaging: Ship macOS dSYMs in their own .dmg. Create a Wireshark.dSYM bundle for our debugging symbols. Create a separate .dmg for the dSYM bundle, similar to what we do for Windows. `dwarfdump --uuid run/Wireshark.dSYM` returns what app This reduces the size of the application bundle and .dmg quite a bit (sizes measured with `du -sm`): 51 Wireshark 3.7.0 Intel 64.dmg 81 Wireshark dSYM 3.7.0 Intel 64.dmg 182 Wireshark.app 262 Wireshark.dSYM
2022-02-26 23:14:36 +00:00
COMMAND ${ASCIIDOCTOR_EXECUTABLE}
--backend html
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
--out-file ${_wireshark_dsym_installation}
Packaging: Ship macOS dSYMs in their own .dmg. Create a Wireshark.dSYM bundle for our debugging symbols. Create a separate .dmg for the dSYM bundle, similar to what we do for Windows. `dwarfdump --uuid run/Wireshark.dSYM` returns what app This reduces the size of the application bundle and .dmg quite a bit (sizes measured with `du -sm`): 51 Wireshark 3.7.0 Intel 64.dmg 81 Wireshark dSYM 3.7.0 Intel 64.dmg 182 Wireshark.app 262 Wireshark.dSYM
2022-02-26 23:14:36 +00:00
--attribute include-dir=${CMAKE_SOURCE_DIR}/docbook
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Wireshark_dsym_installation.adoc
Packaging: Ship macOS dSYMs in their own .dmg. Create a Wireshark.dSYM bundle for our debugging symbols. Create a separate .dmg for the dSYM bundle, similar to what we do for Windows. `dwarfdump --uuid run/Wireshark.dSYM` returns what app This reduces the size of the application bundle and .dmg quite a bit (sizes measured with `du -sm`): 51 Wireshark 3.7.0 Intel 64.dmg 81 Wireshark dSYM 3.7.0 Intel 64.dmg 182 Wireshark.app 262 Wireshark.dSYM
2022-02-26 23:14:36 +00:00
DEPENDS
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Wireshark_dsym_installation.adoc
Packaging: Ship macOS dSYMs in their own .dmg. Create a Wireshark.dSYM bundle for our debugging symbols. Create a separate .dmg for the dSYM bundle, similar to what we do for Windows. `dwarfdump --uuid run/Wireshark.dSYM` returns what app This reduces the size of the application bundle and .dmg quite a bit (sizes measured with `du -sm`): 51 Wireshark 3.7.0 Intel 64.dmg 81 Wireshark dSYM 3.7.0 Intel 64.dmg 182 Wireshark.app 262 Wireshark.dSYM
2022-02-26 23:14:36 +00:00
)
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
add_custom_target(wireshark_dmg_readmes DEPENDS ${_wireshark_read_me_first} ${_wireshark_dsym_installation} )
add_dependencies(wireshark_dmg_prep wireshark_dmg_readmes)
macOS: Make the dmg_package target fail noisily. Change-Id: I479c9f13b9695d78d47b698a14cda0989724c639 Reviewed-on: https://code.wireshark.org/review/36270 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-03-03 16:28:39 +00:00
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
ADD_CUSTOM_TARGET( wireshark_dmg
macOS: Make the dmg_package target fail noisily. Change-Id: I479c9f13b9695d78d47b698a14cda0989724c639 Reviewed-on: https://code.wireshark.org/review/36270 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-03-03 16:28:39 +00:00
COMMAND bash -x ${CMAKE_BINARY_DIR}/packaging/macosx/osx-dmg.sh
NSIS: Update some target and filenames. Rename the following build targets, similar to the recent macOS target name changes: nsis_package_prep to wireshark_nsis_prep nsis_package to wireshark_nsis Rename some NSIS files to reflect that they're specific to Wireshark. Update the documentation and CI configurations.
2022-06-02 22:07:09 +00:00
# Unlike wireshark_nsis_prep + wireshark_nsis, we can add a direct
macOS: Make the dmg_package target fail noisily. Change-Id: I479c9f13b9695d78d47b698a14cda0989724c639 Reviewed-on: https://code.wireshark.org/review/36270 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-03-03 16:28:39 +00:00
# dependency here.
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
DEPENDS wireshark_dmg_prep
macOS: Make the dmg_package target fail noisily. Change-Id: I479c9f13b9695d78d47b698a14cda0989724c639 Reviewed-on: https://code.wireshark.org/review/36270 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-03-03 16:28:39 +00:00
# We create Wireshark.app in "run". Do our work there.
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/run
)
OS X: Integrate CMake and osx-dmg.sh Change-Id: Ide608f5e73ecd40c67a6b1c0e16f11233cd49c9d Reviewed-on: https://code.wireshark.org/review/10694 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-23 17:57:45 +00:00
CMake: Build an application bundle (Wireshark.app) on OS X. Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on OS X and disabled elsewhere. The bundle is currently bare-bones and only contains the main executables, Info.plist, and application icon. Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is set and on Windows. Start updating CPackConfig.txt for OS X packaging. To do: - Add supporting libraries and frameworks. - Make the bundle standalone. I.e. call FIXUP_BUNDLE or replicate the relevant parts of osx-app.sh Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb Reviewed-on: https://code.wireshark.org/review/4577 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-09 18:37:27 +00:00
endif()
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
if(ENABLE_APPLICATION_BUNDLE AND BUILD_logray)
add_custom_target(logray_app_bundle)
set_target_properties(logray_app_bundle PROPERTIES FOLDER "Copy Tasks")
add_custom_command(TARGET logray_app_bundle
CMake+packaging: Add a logwolf_app_bundle target. Add a logwolf_app_bundle target and update osx-app.sh to handle different application bundle names.
2022-02-28 22:04:09 +00:00
POST_BUILD
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
COMMAND "${CMAKE_BINARY_DIR}/packaging/macosx/osx-app.sh" --bundle Logray.app
CMake+packaging: Add a logwolf_app_bundle target. Add a logwolf_app_bundle target and update osx-app.sh to handle different application bundle names.
2022-02-28 22:04:09 +00:00
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/run"
)
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
add_custom_target(logray_dmg_prep DEPENDS logray_app_bundle)
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
FILE(MAKE_DIRECTORY packaging/macosx/logray)
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
set(_logray_read_me_first "packaging/macosx/logray/Read me first.html")
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
ADD_CUSTOM_COMMAND(
OUTPUT
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
${_logray_read_me_first}
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
COMMAND ${ASCIIDOCTOR_EXECUTABLE}
--backend html
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
--out-file ${_logray_read_me_first}
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
--attribute include-dir=${CMAKE_SOURCE_DIR}/docbook
--attribute min-macos-version=${MIN_MACOS_VERSION}
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logray_read_me_first.adoc
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
DEPENDS
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logray_read_me_first.adoc
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
)
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
set(_logray_dsym_installation "packaging/macosx/logray/Debugging symbols installation.html")
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
ADD_CUSTOM_COMMAND(
OUTPUT
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
${_logray_dsym_installation}
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
COMMAND ${ASCIIDOCTOR_EXECUTABLE}
--backend html
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
--out-file ${_logray_dsym_installation}
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
--attribute include-dir=${CMAKE_SOURCE_DIR}/docbook
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logray_dsym_installation.adoc
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
DEPENDS
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
${CMAKE_CURRENT_SOURCE_DIR}/packaging/macosx/Logray_dsym_installation.adoc
macOS: Add Logwolf packaging targets. Rename the following build targets: app_bundle to wireshark_app_bundle dmg_package_prep to wireshark_dmg_prep dmg_package to wireshark_dmg Add logwolf_app_bundle, logwolf_dmg_prep, and logwolf_dmg targets and packaging assets. Update the documentation. We need to add a set of Logwolf version variables to CMake and make-version.pl. Add a static logwolf-version attribute to attributes.adoc in the mean time.
2022-05-25 20:56:57 +00:00
)
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
add_custom_target(logray_dmg_readmes DEPENDS ${_logray_read_me_first} ${_logray_dsym_installation} )
add_dependencies(logray_dmg_prep logray_dmg_readmes)
CMake+packaging: Add a logwolf_app_bundle target. Add a logwolf_app_bundle target and update osx-app.sh to handle different application bundle names.
2022-02-28 22:04:09 +00:00
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
ADD_CUSTOM_TARGET( logray_dmg
COMMAND bash -x ${CMAKE_BINARY_DIR}/packaging/macosx/osx-dmg.sh --app-name Logray
CMake+Packaging: Add a logwolf_dmg target.
2022-06-08 01:38:46 +00:00
# Unlike wireshark_nsis_prep + wireshark_nsis, we can add a direct
# dependency here.
Rename Logwolf to Logray Switch to the name "Logray" for the log analyzer. Rays are biological cousins of sharks and more people like the name "Logray" in a completely unscientific survey here. Apologies for any inconvenience this might cause.
2022-06-30 16:45:49 +00:00
DEPENDS logray_dmg_prep
CMake+Packaging: Add a logwolf_dmg target.
2022-06-08 01:38:46 +00:00
# We create Wireshark.app in "run". Do our work there.
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/run
)
CMake+packaging: Add a logwolf_app_bundle target. Add a logwolf_app_bundle target and update osx-app.sh to handle different application bundle names.
2022-02-28 22:04:09 +00:00
endif()
CMake: Add an rpm-package target. Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-20 23:15:33 +00:00
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
find_program(RPMBUILD_EXECUTABLE rpmbuild)
find_program(GIT_EXECUTABLE git)
Packaging: Add initial support for AppImage. Add an "appimage" target that will create an AppImage package. Current AppImage tools assume that you only have one executable, so add a custom AppRun wrapper that will let you run our associated CLI utilities via symlinks, e.g. ln -s ./Wireshark-3.2.1-x86.appimage capinfos ./capinfos --help Packaging requires both linuxdeployqt and appimagetool, although we might be able to reduce this to just linuxdeployqt: https://github.com/probonopd/linuxdeployqt https://github.com/AppImage/AppImageKit I haven't done much testing beyond running Wireshark and capinfos. There are undoubtedly issues that need to be fixed. Bug: 14464 Change-Id: Ic004ba1962e6a8630ebb017349d9b2c0462fd5fe Reviewed-on: https://code.wireshark.org/review/30953 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-07 01:23:54 +00:00
# Should we add appimaged's monitored directories
# as HINTS?
# https://github.com/AppImage/appimaged
find_program(LINUXDEPLOYQT_EXECUTABLE linuxdeployqt)
find_program(APPIMAGETOOL_EXECUTABLE appimagetool)
CMake: Add an rpm-package target. Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-20 23:15:33 +00:00
endif()
rpm-package: Use version.h to generate version string in RPM Packaging. Change-Id: I463be4523f789406ff0cb3a1a325d6937db63b3d Reviewed-on: https://code.wireshark.org/review/27179 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-27 14:22:53 +00:00
CMake: Deduplicate some version variables. Use PROJECT_VERSION instead of VERSION. Prepend "PROJECT_" or "LOG_PROJECT_" as needed to other variables. Remove the leftover unused variables.
2022-06-07 22:51:24 +00:00
string(REPLACE "-" "_" RPM_VERSION "${PROJECT_VERSION}")
tarball+RPM: Fetch our version from CMake. Move git-export-release.sh to packaging/source. Have the source and RPM packaging derive version information from CMake's VERSION variable. This brings them in line with the rest of our packaging and avoids having to read chicken entrails^W^Wgit output. Make sure we always generate wireshark.spec. Bug: 15359 Change-Id: I188efda489c94449a10a612abebf9c2872c305cb Reviewed-on: https://code.wireshark.org/review/31504 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-11 22:34:03 +00:00
configure_file(packaging/rpm/wireshark.spec.in ${CMAKE_BINARY_DIR}/packaging/rpm/SPECS/wireshark.spec)
RPM: enable rpm target even if git is not available Change-Id: Ic6a7d656aeb0ae30c5e1cc1d8f12ed5ad43f73d7 Reviewed-on: https://code.wireshark.org/review/26968 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16 14:48:42 +00:00
if(RPMBUILD_EXECUTABLE)
CMake: Add an rpm-package target. Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-20 23:15:33 +00:00
foreach(_rpm_dir BUILD RPMS SOURCES SPECS SRPMS)
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/packaging/rpm/${_rpm_dir}")
endforeach()
set(_rpmbuild_with_args)
GitHub CI, CMake: override the definition of cmake_build. Overriding the definition of the rpmbuild macro cmake_build on the command line, so that it doesn't include the string "--verbose", should prevent cmake --build from being run with --verbose, and thus prevent it from running Ninja with the -v flag, and thus prevent a bunch of extra noisy output from being produced for every build command, and thus prevent the build log from hitting GitLab's 4MB limit. Unlike piping the output of "ninja rpm-package" to sed, this means that the exit status of "ninja rpm-package", rather than the exit status of sed, is tested.
2021-02-16 08:33:50 +00:00
#
# This is ugly.
#
# At least some versions of rpmbuild define the cmake_build
# macro to run "cmake --build" with the "--verbose" option,
# with no obvious way to easily override that, so, if you
# are doing a build with lots of source files, and with
# lots of compiler options (for example, a log of -W flags),
# you can get a lot of output from rpmbuild.
#
# Wireshark is a program with lots of source files and
# lots of compiler options.
#
# GitLab's shared builders have a limit of 4MB on logs
# from build jobs.
#
# Wireshark uses the shared builders, and can produce
# more than 4MB with the Fedora RPM build; this causes
# the builds to fail.
#
# Forcibly overriding the cmake_build macro with a
# version that lacks the --version file should
# prevent ninja from being run with the -v flag,
# so that it prints the compact output rather
# than the raw command.
#
# We don't do that by default; if the build has the
# FORCE_CMAKE_NINJA_QUIET environment variable set,
# it will add it.
#
if(DEFINED ENV{FORCE_CMAKE_NINJA_NON_VERBOSE})
#
# Get the output of a pipeline running
# "rpmbuild --showrc", to find the settings
# of all macros, piped to an awk script
# to extract the value of the cmake_build
# macro.
#
execute_process(
COMMAND rpmbuild --showrc
COMMAND awk "/: cmake_build/ { getline; print \$0; exit }"
OUTPUT_VARIABLE CMAKE_BUILD_VALUE
OUTPUT_STRIP_TRAILING_WHITESPACE)
if (CMAKE_BUILD_VALUE MATCHES ".*--verbose.*")
#
# OK, the setting contains "--verbose".
# Rip it out.
#
string(REPLACE "--verbose" ""
NON_VERBOSE_CMAKE_BUILD_VALUE
${CMAKE_BUILD_VALUE})
list(APPEND _rpmbuild_with_args --define "cmake_build ${NON_VERBOSE_CMAKE_BUILD_VALUE}")
endif()
CMake, GitLab CI: forcibly unset CMAKE_VERBOSE_MAKEFILE if requested. Forcibly unset the cached version of CMAKE_VERBOSE_MAKEFILE if the FORCE_CMAKE_NINJA_NON_VERBOSE environment variable is set, to make *extra* sure that we don't do a verbose build.
2021-02-16 21:23:46 +00:00
else()
if(CMAKE_VERBOSE_MAKEFILE)
list(APPEND _rpmbuild_with_args -v)
endif()
GitHub CI, CMake: override the definition of cmake_build. Overriding the definition of the rpmbuild macro cmake_build on the command line, so that it doesn't include the string "--verbose", should prevent cmake --build from being run with --verbose, and thus prevent it from running Ninja with the -v flag, and thus prevent a bunch of extra noisy output from being produced for every build command, and thus prevent the build log from hitting GitLab's 4MB limit. Unlike piping the output of "ninja rpm-package" to sed, this means that the exit status of "ninja rpm-package", rather than the exit status of sed, is tested.
2021-02-16 08:33:50 +00:00
endif()
rpm: Support for building with clang on Fedora Fedora now supports rpm options to build with clang as the compiler https://docs.fedoraproject.org/en-US/packaging-guidelines/#compiler
2022-01-19 14:12:55 +00:00
if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
list(APPEND _rpmbuild_with_args --with toolchain_clang)
endif()
CMake: Add an rpm-package target. Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-20 23:15:33 +00:00
if(CMAKE_GENERATOR STREQUAL "Ninja")
list(APPEND _rpmbuild_with_args --with ninja)
endif()
RPM: optionally use ccache to speed up (re)builds. Installing and enabling ccache makes testing RPM builds (which always do a complete build) much less painful. Change-Id: Ie9ab1794614701cdbe261089f81398c2b7d1f027 Reviewed-on: https://code.wireshark.org/review/29812 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-09-24 19:45:18 +00:00
if(CCACHE_EXECUTABLE)
list(APPEND _rpmbuild_with_args --with ccache)
endif()
RPM: respect options for disabling Qt, SpanDSP and BCG729 "%bcond_without" enables a feature by default. Be sure to explicitly disable features to match the requested configuration. Change-Id: I90687f35bcd953670e147be9e70af03aaeaef5dc Ping-Bug: 14606 Reviewed-on: https://code.wireshark.org/review/31933 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-08 11:04:02 +00:00
if(NOT BUILD_wireshark)
list(APPEND _rpmbuild_with_args --without qt5)
CMake: Add an rpm-package target. Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-20 23:15:33 +00:00
endif()
RPM packaging: maxminddb is optional. Don't require the RPM to include maxminddb if we couldn't find it. Treat it like the other optional packages: enable it in the RPM iff we found it. IOW if cmake ran and will build Wireshark [without maxminddb] you'll also be able to build an RPM [without maxminddb]. Change-Id: I012b75ae44e9289275b68db2eb804fc45bb0d330 Reviewed-on: https://code.wireshark.org/review/29807 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2018-09-24 15:42:48 +00:00
if (MAXMINDDB_FOUND)
CMake: Add an rpm-package target. Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-20 23:15:33 +00:00
list(APPEND _rpmbuild_with_args --with mmdbresolve)
endif()
if (LUA_FOUND)
list(APPEND _rpmbuild_with_args --with lua)
endif()
if (LZ4_FOUND AND SNAPPY_FOUND)
CMake RPM build: Try to get rid of %globals in favor of %bcond. Change-Id: I051fb722b0c4161b373f04a79288faa41a61c3cc Reviewed-on: https://code.wireshark.org/review/26735 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-04 08:00:06 +00:00
list(APPEND _rpmbuild_with_args --with lz4_and_snappy)
CMake: Add an rpm-package target. Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-20 23:15:33 +00:00
endif()
if (SPANDSP_FOUND)
CMake RPM build: Try to get rid of %globals in favor of %bcond. Change-Id: I051fb722b0c4161b373f04a79288faa41a61c3cc Reviewed-on: https://code.wireshark.org/review/26735 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-04 08:00:06 +00:00
list(APPEND _rpmbuild_with_args --with spandsp)
CMake: Add an rpm-package target. Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-20 23:15:33 +00:00
endif()
if (BCG729_FOUND)
CMake RPM build: Try to get rid of %globals in favor of %bcond. Change-Id: I051fb722b0c4161b373f04a79288faa41a61c3cc Reviewed-on: https://code.wireshark.org/review/26735 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-04 08:00:06 +00:00
list(APPEND _rpmbuild_with_args --with bcg729)
CMake: Add an rpm-package target. Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-20 23:15:33 +00:00
endif()
RTP: decode iLBC payload It is possible to decode iLBC payload. It uses libilbc library (https://github.com/TimothyGu/libilbc). Bug: 16314 Change-Id: Id4cad7ae32305a0e94ef32beb24e07733d7f834e Reviewed-on: https://code.wireshark.org/review/35686 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-18 22:55:25 +00:00
if (ILBC_FOUND)
list(APPEND _rpmbuild_with_args --with ilbc)
endif()
RTP: opus playback It's possible to play opus payload with libopus (https://opus-codec.org/). Closes #16882. Helped-by: Pascal Quantin <pascal.quantin@gmail.com> Signed-off-by: Lin Sun <lin.sun@zoom.us> Signed-off-by: Yuanzhi Li <ryanlee@mail.ustc.edu.cn>
2020-09-29 04:33:06 +00:00
if (OPUS_FOUND)
list(APPEND _rpmbuild_with_args --with opus)
endif()
CMake: Add an rpm-package target. Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-20 23:15:33 +00:00
if (LIBXML2_FOUND)
CMake RPM build: Try to get rid of %globals in favor of %bcond. Change-Id: I051fb722b0c4161b373f04a79288faa41a61c3cc Reviewed-on: https://code.wireshark.org/review/26735 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-04 08:00:06 +00:00
list(APPEND _rpmbuild_with_args --with libxml2)
CMake: Add an rpm-package target. Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-20 23:15:33 +00:00
endif()
if (NGHTTP2_FOUND)
CMake RPM build: Try to get rid of %globals in favor of %bcond. Change-Id: I051fb722b0c4161b373f04a79288faa41a61c3cc Reviewed-on: https://code.wireshark.org/review/26735 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-04 08:00:06 +00:00
list(APPEND _rpmbuild_with_args --with nghttp2)
CMake: Add an rpm-package target. Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-20 23:15:33 +00:00
endif()
CMake: Add a systemd RPM check. Change-Id: Ib679994f5af129254865daad211913a6b068de12 Reviewed-on: https://code.wireshark.org/review/29968 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-01 23:28:03 +00:00
if (SYSTEMD_FOUND)
list(APPEND _rpmbuild_with_args --with sdjournal)
endif()
Add brotli decompression support for HTTP and HTTP2 dissectors. Change-Id: I9c09f55673187f6fee723fcd72798fb6b9958b03 Reviewed-on: https://code.wireshark.org/review/32745 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-10 10:52:52 +00:00
if (BROTLI_FOUND)
list(APPEND _rpmbuild_with_args --with brotli)
endif()
CMake: Add an rpm-package target. Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-20 23:15:33 +00:00
rpm-package: Use version.h to generate version string in RPM Packaging. Change-Id: I463be4523f789406ff0cb3a1a325d6937db63b3d Reviewed-on: https://code.wireshark.org/review/27179 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-27 14:22:53 +00:00
execute_process(
tools: Port make-version.pl to Python
2022-07-11 14:44:23 +00:00
COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_SOURCE_DIR}/tools/make-version.py
rpm-package: Use version.h to generate version string in RPM Packaging. Change-Id: I463be4523f789406ff0cb3a1a325d6937db63b3d Reviewed-on: https://code.wireshark.org/review/27179 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-27 14:22:53 +00:00
${CMAKE_SOURCE_DIR}
)
cmake: make rpm-package dependent from dist target.
2020-12-24 13:05:12 +00:00
add_custom_target(copy-dist
COMMAND cp ${CMAKE_BINARY_DIR}/wireshark*tar* ${CMAKE_BINARY_DIR}/packaging/rpm/SOURCES/
DEPENDS dist
CMake: Add an rpm-package target. Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-20 23:15:33 +00:00
)
CMake: Update package target names. Rename the rpm-package target to wireshark_rpm and the appimage target to wireshark_appimage.
2022-06-08 16:29:59 +00:00
add_custom_target(wireshark_rpm
CMake: Add an rpm-package target. Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-20 23:15:33 +00:00
COMMAND ${RPMBUILD_EXECUTABLE}
--define "_topdir ${CMAKE_BINARY_DIR}/packaging/rpm"
--define "_prefix ${CMAKE_INSTALL_PREFIX}"
${_rpmbuild_with_args}
CMake: remove --clean from rpmbuild invocation This allows for inspection of the build artifacts for a RPM build. It is consistent with the deb-package target not executing --post-clean. Change-Id: I63e3c571c893a104b5cfa98a0c67c8fdca03a964 Reviewed-on: https://code.wireshark.org/review/31538 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-14 12:26:14 +00:00
-ba SPECS/wireshark.spec
cmake: make rpm-package dependent from dist target.
2020-12-24 13:05:12 +00:00
DEPENDS copy-dist
CMake: Add an rpm-package target. Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-20 23:15:33 +00:00
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/packaging/rpm"
cmake: fix comment in rpm-build target.
2020-12-22 13:48:51 +00:00
COMMENT "Create a rpm from the current git commit."
CMake: Add an rpm-package target. Copy the current wireshark.spec.in and update it for use with CMake. Remove the Qt4, GTK+2, and GTK+3 options. Add Ninja and mmdbresolve options. The rpm-package target builds a tarball using git-export-release.sh and therefore must be run from a git checkout. The RPM _prefix macro is set to CMAKE_INSTALL_PREFIX, so you'll probably want to run cmake -DCMAKE_INSTALL_PREFIX=/usr ... Change-Id: Ib014494d8858a0059126404cd91528ded5d8a9f6 Reviewed-on: https://code.wireshark.org/review/26579 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-20 23:15:33 +00:00
)
endif()
AppImage: Fix symbol name error in CMakeList.txt Change-Id: Ibaf85eaea382f2e600fc8f725b2adaa344836ae3 Reviewed-on: https://code.wireshark.org/review/33832 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-07-03 19:10:36 +00:00
if(LINUXDEPLOYQT_EXECUTABLE AND APPIMAGETOOL_EXECUTABLE)
Packaging: Add initial support for AppImage. Add an "appimage" target that will create an AppImage package. Current AppImage tools assume that you only have one executable, so add a custom AppRun wrapper that will let you run our associated CLI utilities via symlinks, e.g. ln -s ./Wireshark-3.2.1-x86.appimage capinfos ./capinfos --help Packaging requires both linuxdeployqt and appimagetool, although we might be able to reduce this to just linuxdeployqt: https://github.com/probonopd/linuxdeployqt https://github.com/AppImage/AppImageKit I haven't done much testing beyond running Wireshark and capinfos. There are undoubtedly issues that need to be fixed. Bug: 14464 Change-Id: Ic004ba1962e6a8630ebb017349d9b2c0462fd5fe Reviewed-on: https://code.wireshark.org/review/30953 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-07 01:23:54 +00:00
# The documentation at https://github.com/probonopd/linuxdeployqt
# says that you need to set CMAKE_BUILD_TYPE=Release and
# CMAKE_INSTALL_PREFIX=/usr. I (gcc) also had to set
# CMAKE_INSTALL_LIBDIR=/usr/lib.
if (CMAKE_BUILD_TYPE STREQUAL "Release" AND CMAKE_INSTALL_PREFIX STREQUAL "/usr" AND CMAKE_INSTALL_LIBDIR STREQUAL "/usr/lib" )
CMake: Update package target names. Rename the rpm-package target to wireshark_rpm and the appimage target to wireshark_appimage.
2022-06-08 16:29:59 +00:00
add_custom_target(wireshark_appimage_prerequisites)
add_dependencies(wireshark_appimage_prerequisites ${PROGLIST})
Packaging: Add initial support for AppImage. Add an "appimage" target that will create an AppImage package. Current AppImage tools assume that you only have one executable, so add a custom AppRun wrapper that will let you run our associated CLI utilities via symlinks, e.g. ln -s ./Wireshark-3.2.1-x86.appimage capinfos ./capinfos --help Packaging requires both linuxdeployqt and appimagetool, although we might be able to reduce this to just linuxdeployqt: https://github.com/probonopd/linuxdeployqt https://github.com/AppImage/AppImageKit I haven't done much testing beyond running Wireshark and capinfos. There are undoubtedly issues that need to be fixed. Bug: 14464 Change-Id: Ic004ba1962e6a8630ebb017349d9b2c0462fd5fe Reviewed-on: https://code.wireshark.org/review/30953 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-07 01:23:54 +00:00
else()
CMake: Update package target names. Rename the rpm-package target to wireshark_rpm and the appimage target to wireshark_appimage.
2022-06-08 16:29:59 +00:00
add_custom_target(wireshark_appimage_prerequisites
Packaging: Add initial support for AppImage. Add an "appimage" target that will create an AppImage package. Current AppImage tools assume that you only have one executable, so add a custom AppRun wrapper that will let you run our associated CLI utilities via symlinks, e.g. ln -s ./Wireshark-3.2.1-x86.appimage capinfos ./capinfos --help Packaging requires both linuxdeployqt and appimagetool, although we might be able to reduce this to just linuxdeployqt: https://github.com/probonopd/linuxdeployqt https://github.com/AppImage/AppImageKit I haven't done much testing beyond running Wireshark and capinfos. There are undoubtedly issues that need to be fixed. Bug: 14464 Change-Id: Ic004ba1962e6a8630ebb017349d9b2c0462fd5fe Reviewed-on: https://code.wireshark.org/review/30953 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-07 01:23:54 +00:00
COMMAND echo "CMAKE_BUILD_TYPE isn't Release or CMAKE_INSTALL_PREFIX isn't /usr or CMAKE_INSTALL_LIBDIR isn't /usr/lib."
COMMAND false
)
endif()
set (_ai_appdir "${CMAKE_BINARY_DIR}/packaging/appimage/appdir")
CMake: Update package target names. Rename the rpm-package target to wireshark_rpm and the appimage target to wireshark_appimage.
2022-06-08 16:29:59 +00:00
add_custom_target(wireshark_appimage_appdir
Packaging: Add initial support for AppImage. Add an "appimage" target that will create an AppImage package. Current AppImage tools assume that you only have one executable, so add a custom AppRun wrapper that will let you run our associated CLI utilities via symlinks, e.g. ln -s ./Wireshark-3.2.1-x86.appimage capinfos ./capinfos --help Packaging requires both linuxdeployqt and appimagetool, although we might be able to reduce this to just linuxdeployqt: https://github.com/probonopd/linuxdeployqt https://github.com/AppImage/AppImageKit I haven't done much testing beyond running Wireshark and capinfos. There are undoubtedly issues that need to be fixed. Bug: 14464 Change-Id: Ic004ba1962e6a8630ebb017349d9b2c0462fd5fe Reviewed-on: https://code.wireshark.org/review/30953 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-07 01:23:54 +00:00
COMMAND ${CMAKE_COMMAND} -E make_directory "${_ai_appdir}"
COMMAND env DESTDIR=${_ai_appdir}
${CMAKE_COMMAND} --build . --target install
CMake: Update package target names. Rename the rpm-package target to wireshark_rpm and the appimage target to wireshark_appimage.
2022-06-08 16:29:59 +00:00
DEPENDS wireshark_appimage_prerequisites
Packaging: Add initial support for AppImage. Add an "appimage" target that will create an AppImage package. Current AppImage tools assume that you only have one executable, so add a custom AppRun wrapper that will let you run our associated CLI utilities via symlinks, e.g. ln -s ./Wireshark-3.2.1-x86.appimage capinfos ./capinfos --help Packaging requires both linuxdeployqt and appimagetool, although we might be able to reduce this to just linuxdeployqt: https://github.com/probonopd/linuxdeployqt https://github.com/AppImage/AppImageKit I haven't done much testing beyond running Wireshark and capinfos. There are undoubtedly issues that need to be fixed. Bug: 14464 Change-Id: Ic004ba1962e6a8630ebb017349d9b2c0462fd5fe Reviewed-on: https://code.wireshark.org/review/30953 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-07 01:23:54 +00:00
)
set(_exe_args)
foreach(_prog ${PROGLIST})
# XXX Is this the correct path?
list(APPEND _exe_args "-executable=${_ai_appdir}/usr/bin/${_prog}")
endforeach()
# linuxdeployqt currently clobbers AppRun:
# https://github.com/probonopd/linuxdeployqt/issues/159
# When that's fixed we will no longer need appimagetool. Until
# then, we need to prep and package in two steps:
# https://github.com/probonopd/linuxdeployqt/wiki/Custom-wrapper-script-instead-of-AppRun
CMake: Update package target names. Rename the rpm-package target to wireshark_rpm and the appimage target to wireshark_appimage.
2022-06-08 16:29:59 +00:00
add_custom_target(wireshark_appimage_prep
Packaging: Add initial support for AppImage. Add an "appimage" target that will create an AppImage package. Current AppImage tools assume that you only have one executable, so add a custom AppRun wrapper that will let you run our associated CLI utilities via symlinks, e.g. ln -s ./Wireshark-3.2.1-x86.appimage capinfos ./capinfos --help Packaging requires both linuxdeployqt and appimagetool, although we might be able to reduce this to just linuxdeployqt: https://github.com/probonopd/linuxdeployqt https://github.com/AppImage/AppImageKit I haven't done much testing beyond running Wireshark and capinfos. There are undoubtedly issues that need to be fixed. Bug: 14464 Change-Id: Ic004ba1962e6a8630ebb017349d9b2c0462fd5fe Reviewed-on: https://code.wireshark.org/review/30953 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-07 01:23:54 +00:00
COMMAND ${LINUXDEPLOYQT_EXECUTABLE}
Linux: rename metadata according to spec https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s02.html#desktop-file-id
2020-12-06 14:38:41 +00:00
"${_ai_appdir}/usr/share/applications/org.wireshark.Wireshark.desktop"
Packaging: Add initial support for AppImage. Add an "appimage" target that will create an AppImage package. Current AppImage tools assume that you only have one executable, so add a custom AppRun wrapper that will let you run our associated CLI utilities via symlinks, e.g. ln -s ./Wireshark-3.2.1-x86.appimage capinfos ./capinfos --help Packaging requires both linuxdeployqt and appimagetool, although we might be able to reduce this to just linuxdeployqt: https://github.com/probonopd/linuxdeployqt https://github.com/AppImage/AppImageKit I haven't done much testing beyond running Wireshark and capinfos. There are undoubtedly issues that need to be fixed. Bug: 14464 Change-Id: Ic004ba1962e6a8630ebb017349d9b2c0462fd5fe Reviewed-on: https://code.wireshark.org/review/30953 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-07 01:23:54 +00:00
${_exe_args}
COMMAND rm -f "${_ai_appdir}/AppRun"
COMMAND install
"${CMAKE_SOURCE_DIR}/packaging/appimage/AppRun"
"${_ai_appdir}/AppRun"
CMake: Update package target names. Rename the rpm-package target to wireshark_rpm and the appimage target to wireshark_appimage.
2022-06-08 16:29:59 +00:00
DEPENDS wireshark_appimage_appdir
Packaging: Add initial support for AppImage. Add an "appimage" target that will create an AppImage package. Current AppImage tools assume that you only have one executable, so add a custom AppRun wrapper that will let you run our associated CLI utilities via symlinks, e.g. ln -s ./Wireshark-3.2.1-x86.appimage capinfos ./capinfos --help Packaging requires both linuxdeployqt and appimagetool, although we might be able to reduce this to just linuxdeployqt: https://github.com/probonopd/linuxdeployqt https://github.com/AppImage/AppImageKit I haven't done much testing beyond running Wireshark and capinfos. There are undoubtedly issues that need to be fixed. Bug: 14464 Change-Id: Ic004ba1962e6a8630ebb017349d9b2c0462fd5fe Reviewed-on: https://code.wireshark.org/review/30953 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-07 01:23:54 +00:00
)
CMake: Update package target names. Rename the rpm-package target to wireshark_rpm and the appimage target to wireshark_appimage.
2022-06-08 16:29:59 +00:00
add_custom_target(wireshark_appimage
Packaging: Add initial support for AppImage. Add an "appimage" target that will create an AppImage package. Current AppImage tools assume that you only have one executable, so add a custom AppRun wrapper that will let you run our associated CLI utilities via symlinks, e.g. ln -s ./Wireshark-3.2.1-x86.appimage capinfos ./capinfos --help Packaging requires both linuxdeployqt and appimagetool, although we might be able to reduce this to just linuxdeployqt: https://github.com/probonopd/linuxdeployqt https://github.com/AppImage/AppImageKit I haven't done much testing beyond running Wireshark and capinfos. There are undoubtedly issues that need to be fixed. Bug: 14464 Change-Id: Ic004ba1962e6a8630ebb017349d9b2c0462fd5fe Reviewed-on: https://code.wireshark.org/review/30953 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-07 01:23:54 +00:00
COMMAND env VERSION=${PROJECT_VERSION} ${APPIMAGETOOL_EXECUTABLE} appdir
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/packaging/appimage"
CMake: Update package target names. Rename the rpm-package target to wireshark_rpm and the appimage target to wireshark_appimage.
2022-06-08 16:29:59 +00:00
DEPENDS wireshark_appimage_prep
Packaging: Add initial support for AppImage. Add an "appimage" target that will create an AppImage package. Current AppImage tools assume that you only have one executable, so add a custom AppRun wrapper that will let you run our associated CLI utilities via symlinks, e.g. ln -s ./Wireshark-3.2.1-x86.appimage capinfos ./capinfos --help Packaging requires both linuxdeployqt and appimagetool, although we might be able to reduce this to just linuxdeployqt: https://github.com/probonopd/linuxdeployqt https://github.com/AppImage/AppImageKit I haven't done much testing beyond running Wireshark and capinfos. There are undoubtedly issues that need to be fixed. Bug: 14464 Change-Id: Ic004ba1962e6a8630ebb017349d9b2c0462fd5fe Reviewed-on: https://code.wireshark.org/review/30953 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-07 01:23:54 +00:00
)
endif()
CMake: Don't pass /WX to rc.exe Rc.exe doesn't have a /WX flag. Passing it /WX apparently results in setting the /W flag, which warns about invalid code pages, and the /X flag, which ignores %INCLUDE%. The latter is necessary in our case for locating winver.h. Change-Id: I6d757a547fedfa49d078a7bb5f15518c69760f72 Reviewed-on: https://code.wireshark.org/review/22794 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-25 20:31:49 +00:00
set(CLEAN_C_FILES
Include dumpcap amongst the programs built with -Werror. Change-Id: Ia946b4e99d9ddbbced8cc9515a098ca2ce4931ef Reviewed-on: https://code.wireshark.org/review/29113 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-08-12 18:04:36 +00:00
${dumpcap_FILES}
cmake will now honor -Werror if configured (default: on) svn path=/trunk/; revision=30852
2009-11-07 10:07:00 +00:00
${wireshark_FILES}
${tshark_FILES}
${rawshark_FILES}
${dftest_FILES}
${randpkt_FILES}
extcap: add randpktdump, a random packet generator. This new extcap is for testing and educational purpose. It relies on rankpkt-core functions to generate random packets. Change-Id: If6890f0673545682995a2079458108edc0913b30 Reviewed-on: https://code.wireshark.org/review/11764 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-05 17:31:11 +00:00
${randpktdump_FILES}
MBIM: Update dissector to support DLT_ETW New link type DLT_ETW is added for write and read Event Trace on Windows. This change updates MBIM dissector to decode a MBIM message from a DLT_ETW packet.
2020-12-02 09:05:11 +00:00
${etwdump_FILES}
extcap: add udpdump. Udpdump is a generic UDP receiver that exports datagram in PCAP format. Change-Id: I52620a92b12530b6f9b5449c43e692663acdfc14 Reviewed-on: https://code.wireshark.org/review/17195 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-02-10 14:45:45 +00:00
${udpdump_FILES}
Treat the text2pcap scanner as clean. We now disable some warnings on Flex-generated code. Change-Id: I8ff242dc17e7345e9d5883354e921642cb0118fd Reviewed-on: https://code.wireshark.org/review/25823 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-16 22:51:51 +00:00
${text2pcap_FILES}
cmake will now honor -Werror if configured (default: on) svn path=/trunk/; revision=30852
2009-11-07 10:07:00 +00:00
${mergecap_FILES}
${capinfos_FILES}
Add a "captype" file that just reports the type of a capture file, based on what libwiretap thinks it is. Update some comments to reflect the death of the hack used to include (libwiretap) plugin support in programs not built with libwireshark. svn path=/trunk/; revision=54015
2013-12-13 02:59:16 +00:00
${captype_FILES}
cmake will now honor -Werror if configured (default: on) svn path=/trunk/; revision=30852
2009-11-07 10:07:00 +00:00
${editcap_FILES}
Sync some CMake and Autotools install behaviors. Adjust the following CMake and Autotools behaviors in order to synchronize their respective install behaviors: - Disable tfshark by default in CMakeOptions.txt - Add profiles/Bluetooth/preferences to Makefile.am - Add missing captype and ciscodump entries to doc/Makefile.am - Install help/faq.txt on all platforms in CMakeLists.txt - Add BUILD_corbaidl2wrs, BUILD_dcerpcidl2wrs, and BUILD_xxx2deb options to CMake and use them to adjust the corresponding parts of the build. - Pull the DCERPC idl2wrs build steps into the top-level CMakeLists.txt. This change doesn't sync everything. Some installed content still diverges, including the following: - CMake installs a bunch of modules into lib/wireshark: FindGLIB2.cmake FindWireshark.cmake FindWSWinLibs.cmake LocatePythonModule.cmake UseAsn2Wrs.cmake UseMakeDissectorReg.cmake WiresharkConfig.cmake WiresharkConfigVersion.cmake Do we need any or all of these? If so, should the Autotools behavior be synced accordingly? - Autotools installs libtool .la files. It also installs wireshark-gtk.desktop unconditionally. Change-Id: I7846efe08f7139c31b6ceca6f08a1fa5168b3e22 Reviewed-on: https://code.wireshark.org/review/23041 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-10 17:20:30 +00:00
${idl2wrs_FILES}
Transition from GeoIP Legacy to MaxMindDB. MaxMind is discontinuing its legacy databases in April in favor of GeoIP2, which use a newer database format (MaxMind DB). The reference C library (libmaxminddb) is available under the Apache 2.0 license which isn't quite compatible with ours. Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin and prints resolved information on stdout. Place it under a liberal license (MIT) so that we can keep libmaxminddb at arm's length. Add epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it via stdio. Migrate the preferences and documentation to MaxMindDB. Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the geographic coordinate fields to FT_DOUBLEs. Bug: 10658 Change-Id: I24aeed637bea1b41d173270bda413af230f4425f Reviewed-on: https://code.wireshark.org/review/26214 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-09 01:20:26 +00:00
${mmdbresolve_FILES}
cmake will now honor -Werror if configured (default: on) svn path=/trunk/; revision=30852
2009-11-07 10:07:00 +00:00
)
CMake: fix Windows build when all binaries are disabled CLEAN_C_FILES is empty if all BUILD_xxx options are disabled. Bug: 15662 Change-Id: I133b4d00336eb17f7eaeb0d6517ed83c30180373 Reviewed-on: https://code.wireshark.org/review/32895 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-19 11:26:18 +00:00
if(CLEAN_C_FILES)
# Make sure we don't pass /WX to rc.exe. Rc doesn't have a /WX flag,
# but it does have /W (warn about invalid code pages) and /X (ignore
# the INCLUDE environment variable).
# This should apparently be handled for us via CMAKE_RC_FLAG_REGEX
# in CMakeRCInformation.cmake but that doesn't appear to work.
if(WIN32)
list(FILTER CLEAN_C_FILES EXCLUDE REGEX ".*\\.rc")
endif()
CMake: Don't pass /WX to rc.exe Rc.exe doesn't have a /WX flag. Passing it /WX apparently results in setting the /W flag, which warns about invalid code pages, and the /X flag, which ignores %INCLUDE%. The latter is necessary in our case for locating winver.h. Change-Id: I6d757a547fedfa49d078a7bb5f15518c69760f72 Reviewed-on: https://code.wireshark.org/review/22794 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-25 20:31:49 +00:00
CMake: fix Windows build when all binaries are disabled CLEAN_C_FILES is empty if all BUILD_xxx options are disabled. Bug: 15662 Change-Id: I133b4d00336eb17f7eaeb0d6517ed83c30180373 Reviewed-on: https://code.wireshark.org/review/32895 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-19 11:26:18 +00:00
# XXX This also contains object files ($<TARGET_OBJECTS:...>), is that an issue?
set_source_files_properties(
${CLEAN_C_FILES}
PROPERTIES
COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
)
endif()
cmake will now honor -Werror if configured (default: on) svn path=/trunk/; revision=30852
2009-11-07 10:07:00 +00:00
CMake: - Add opcua to the list of plugins to build - Link the gtk stuff statically into wireshark - Beginnings of "make install" - Change a few things about install paths svn path=/trunk/; revision=30029
2009-09-21 00:19:07 +00:00
install(
FILES
${INSTALL_FILES}
CMake: Install the HTML guides. Add a "FileInstall.cmake" module that installs files and directories. Use it to install the chunked HTML guides. Install the guides into CMAKE_INSTALL_FULL_DOCDIR. By default this is /usr/local/share/doc/Wireshark. Define DOC_DIR to match. Add explicit file and directory permissions to the default install targets. Remove the PDF install target. Bug: 14258 Change-Id: I4712a4047a54627b7520b5bf5f191e0761d19606 Reviewed-on: https://code.wireshark.org/review/25737 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-11 22:34:04 +00:00
PERMISSIONS
OWNER_WRITE OWNER_READ
GROUP_READ
WORLD_READ
CMake: - Add opcua to the list of plugins to build - Link the gtk stuff statically into wireshark - Beginnings of "make install" - Change a few things about install paths svn path=/trunk/; revision=30029
2009-09-21 00:19:07 +00:00
DESTINATION
CMake: Simplify CMAKE_INSTALL_DATADIR usage Change-Id: I414aa551b8e9315a654f4da62b882e787d4f6d53 Reviewed-on: https://code.wireshark.org/review/30904 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-12-03 19:23:35 +00:00
${CMAKE_INSTALL_DATADIR}
CMake: - Add opcua to the list of plugins to build - Link the gtk stuff statically into wireshark - Beginnings of "make install" - Change a few things about install paths svn path=/trunk/; revision=30029
2009-09-21 00:19:07 +00:00
)
CMake: Initial work to install headers for the benefit of plugins To be continued incrementally to fix gaps and omissions. If we are willing to reorganize the source tree to have one or two header include folders this could be simplified considerably. It would also force developers to give more consideration to API issues, which is a good thing. See also e7ef19efc0e928b50644b37772ccbf176e74f766. Bug: 14062 Change-Id: I0759da2f9793cfb5cf92c9e231457bba43df4353 Reviewed-on: https://code.wireshark.org/review/23548 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-02 23:42:00 +00:00
set(SHARK_PUBLIC_HEADERS
cfile.h
Put the main() and wmain() routines for CLI programs into a separate file. That means that code is only in one place, rather than having copies of it in each of those programs. CLI programs that, on Windows, should get UTF-8 arguments rather than arguments in the local code page should: include the top-level cli_main.h header; define the main function as real_main(); be built with the top-level cli_main.c file. On UN*X, cli_main.c has a main() program, and just passes the arguments on to real_main(). On Windows, cli_main.c has a wmain() function that converts the UTF-16 arguments it's handed to UTF-8 arguments, using WideCharToMultiByte() so that it doesn't use any functions other than those provided by the system, and then calls real_main() with the argument count and UTF-8 arguments. Change-Id: I8b11f01dbc5c63fce599d1bef9ad96cd92c3c01e Reviewed-on: https://code.wireshark.org/review/31017 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-12 10:53:08 +00:00
cli_main.h
CMake: Initial work to install headers for the benefit of plugins To be continued incrementally to fix gaps and omissions. If we are willing to reorganize the source tree to have one or two header include folders this could be simplified considerably. It would also force developers to give more consideration to API issues, which is a good thing. See also e7ef19efc0e928b50644b37772ccbf176e74f766. Bug: 14062 Change-Id: I0759da2f9793cfb5cf92c9e231457bba43df4353 Reviewed-on: https://code.wireshark.org/review/23548 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-02 23:42:00 +00:00
file.h
Add an include sub-directory to the tree Blind attempt to fix Debian package brokenness managing headers separately from install rules. Global public headers that don't fit any of the Wireshark libraries should be placed in include/. Eventually the C files in the root dir should be placed somewhere else as well (like src/) but this is not a priority. Fixes #17726.
2021-11-11 18:09:22 +00:00
include/ws_attributes.h
include/ws_compiler_tests.h
include/ws_diag_control.h
include/ws_log_defs.h
Add a ws_posix_compat.h header Currently used to define ssize_t on platforms that lack it. Fix some Windows build errors caused by moving the definition into a separate header. Fix some narrowing warnings on Windows x64 from changing the definition of ssize_t from long int to int64_t. The casts in dumpcap are ugly but necessary. The whole code needs to be rewritten for portability, or the warnings disabled.
2021-12-20 02:33:15 +00:00
include/ws_posix_compat.h
Add an include sub-directory to the tree Blind attempt to fix Debian package brokenness managing headers separately from install rules. Global public headers that don't fit any of the Wireshark libraries should be placed in include/. Eventually the C files in the root dir should be placed somewhere else as well (like src/) but this is not a priority. Fixes #17726.
2021-11-11 18:09:22 +00:00
include/ws_symbol_export.h
include/wireshark.h
plugins: Minor interface improvement Change the plugin compatibility check to make it more convenient to define and check the major.minor Wireshark version. Change-Id: I2a6d2a746682c29504311cce5c457e0a852c3daf Reviewed-on: https://code.wireshark.org/review/29224 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-21 14:18:56 +00:00
${CMAKE_BINARY_DIR}/ws_version.h
CMake: Initial work to install headers for the benefit of plugins To be continued incrementally to fix gaps and omissions. If we are willing to reorganize the source tree to have one or two header include folders this could be simplified considerably. It would also force developers to give more consideration to API issues, which is a good thing. See also e7ef19efc0e928b50644b37772ccbf176e74f766. Bug: 14062 Change-Id: I0759da2f9793cfb5cf92c9e231457bba43df4353 Reviewed-on: https://code.wireshark.org/review/23548 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-02 23:42:00 +00:00
)
Install development headers on all platforms Install headers to support plugins development on Windows. Change-Id: I3161bd2f730edf62ab44fee6ce4fedbb9aee0d31 Reviewed-on: https://code.wireshark.org/review/30776 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-11-23 20:39:48 +00:00
install(FILES ${SHARK_PUBLIC_HEADERS}
CMake: Fix DOCDIR on Unix User guides are installed to doc/Wireshark. Use doc/wireshark instead. Remove leftover variable CPACK_PACKAGE_NAME. Change-Id: I9a1d6bdc7d8f0b48c61e43679285d5ba83904a63 Reviewed-on: https://code.wireshark.org/review/31851 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-02-01 16:25:24 +00:00
DESTINATION ${PROJECT_INSTALL_INCLUDEDIR}
Install development headers on all platforms Install headers to support plugins development on Windows. Change-Id: I3161bd2f730edf62ab44fee6ce4fedbb9aee0d31 Reviewed-on: https://code.wireshark.org/review/30776 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-11-23 20:39:48 +00:00
)
CMake: Initial work to install headers for the benefit of plugins To be continued incrementally to fix gaps and omissions. If we are willing to reorganize the source tree to have one or two header include folders this could be simplified considerably. It would also force developers to give more consideration to API issues, which is a good thing. See also e7ef19efc0e928b50644b37772ccbf176e74f766. Bug: 14062 Change-Id: I0759da2f9793cfb5cf92c9e231457bba43df4353 Reviewed-on: https://code.wireshark.org/review/23548 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-02 23:42:00 +00:00
cmake: install icons and .desktop files Based on the install-data-local target from Makefile.am. Change-Id: Ia2ff6b90475a30ed219019fd80afd1a498e3133c Reviewed-on: https://code.wireshark.org/review/18708 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2016-11-08 14:20:30 +00:00
# Install icons and other desktop files for Freedesktop.org-compliant desktops.
GTK Cmake: Remove the option to build the GTK UI. Change-Id: If702717b559a727388d83ce82c0fc2967c662ff0 Reviewed-on: https://code.wireshark.org/review/26747 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-05 06:59:12 +00:00
if((BUILD_wireshark AND QT_FOUND) AND NOT (WIN32 OR APPLE))
Move Freedesktop files to resources/freedesktop.
2022-03-12 00:13:17 +00:00
install(FILES resources/freedesktop/org.wireshark.Wireshark-mime.xml
CMake: Simplify CMAKE_INSTALL_DATADIR usage Change-Id: I414aa551b8e9315a654f4da62b882e787d4f6d53 Reviewed-on: https://code.wireshark.org/review/30904 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-12-03 19:23:35 +00:00
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/mime/packages"
Linux: rename metadata according to spec https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s02.html#desktop-file-id
2020-12-06 14:38:41 +00:00
RENAME org.wireshark.Wireshark.xml
cmake: install icons and .desktop files Based on the install-data-local target from Makefile.am. Change-Id: Ia2ff6b90475a30ed219019fd80afd1a498e3133c Reviewed-on: https://code.wireshark.org/review/18708 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2016-11-08 14:20:30 +00:00
)
Move Freedesktop files to resources/freedesktop.
2022-03-12 00:13:17 +00:00
install(FILES resources/freedesktop/org.wireshark.Wireshark.metainfo.xml
Linux: rename metadata according to spec https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s02.html#desktop-file-id
2020-12-06 14:38:41 +00:00
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo"
cmake: install icons and .desktop files Based on the install-data-local target from Makefile.am. Change-Id: Ia2ff6b90475a30ed219019fd80afd1a498e3133c Reviewed-on: https://code.wireshark.org/review/18708 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2016-11-08 14:20:30 +00:00
)
if(BUILD_wireshark AND QT_FOUND)
Move Freedesktop files to resources/freedesktop.
2022-03-12 00:13:17 +00:00
install(FILES resources/freedesktop/org.wireshark.Wireshark.desktop
CMake: Simplify CMAKE_INSTALL_DATADIR usage Change-Id: I414aa551b8e9315a654f4da62b882e787d4f6d53 Reviewed-on: https://code.wireshark.org/review/30904 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-12-03 19:23:35 +00:00
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
cmake: install icons and .desktop files Based on the install-data-local target from Makefile.am. Change-Id: Ia2ff6b90475a30ed219019fd80afd1a498e3133c Reviewed-on: https://code.wireshark.org/review/18708 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2016-11-08 14:20:30 +00:00
endif()
foreach(size 16 24 32 48 64 128 256)
Rename the "image" directory to "resources". The "image" directory contains resource compiler assets and other application resources, so name it "resources."
2022-03-06 22:16:36 +00:00
install(FILES resources/icons/wsicon${size}.png
CMake: Simplify CMAKE_INSTALL_DATADIR usage Change-Id: I414aa551b8e9315a654f4da62b882e787d4f6d53 Reviewed-on: https://code.wireshark.org/review/30904 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-12-03 19:23:35 +00:00
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${size}x${size}/apps"
Linux: rename metadata according to spec https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s02.html#desktop-file-id
2020-12-06 14:38:41 +00:00
RENAME org.wireshark.Wireshark.png)
Rename the "image" directory to "resources". The "image" directory contains resource compiler assets and other application resources, so name it "resources."
2022-03-06 22:16:36 +00:00
install(FILES resources/icons/WiresharkDoc-${size}.png
CMake: Simplify CMAKE_INSTALL_DATADIR usage Change-Id: I414aa551b8e9315a654f4da62b882e787d4f6d53 Reviewed-on: https://code.wireshark.org/review/30904 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-12-03 19:23:35 +00:00
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${size}x${size}/mimetypes"
Linux: rename metadata according to spec https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s02.html#desktop-file-id
2020-12-06 14:38:41 +00:00
RENAME org.wireshark.Wireshark-mimetype.png)
cmake: install icons and .desktop files Based on the install-data-local target from Makefile.am. Change-Id: Ia2ff6b90475a30ed219019fd80afd1a498e3133c Reviewed-on: https://code.wireshark.org/review/18708 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2016-11-08 14:20:30 +00:00
endforeach()
Rename the "image" directory to "resources". The "image" directory contains resource compiler assets and other application resources, so name it "resources."
2022-03-06 22:16:36 +00:00
install(FILES resources/icons/wsicon.svg
CMake: Simplify CMAKE_INSTALL_DATADIR usage Change-Id: I414aa551b8e9315a654f4da62b882e787d4f6d53 Reviewed-on: https://code.wireshark.org/review/30904 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-12-03 19:23:35 +00:00
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps"
Linux: rename metadata according to spec https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s02.html#desktop-file-id
2020-12-06 14:38:41 +00:00
RENAME org.wireshark.Wireshark.svg)
cmake: install icons and .desktop files Based on the install-data-local target from Makefile.am. Change-Id: Ia2ff6b90475a30ed219019fd80afd1a498e3133c Reviewed-on: https://code.wireshark.org/review/18708 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2016-11-08 14:20:30 +00:00
endif()
Add pkg-config file Change-Id: Ia55a2e560aef8d2f9a3cede18af4555507656047 Reviewed-on: https://code.wireshark.org/review/500 Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-03-04 13:59:39 +00:00
install(
FILES
"${CMAKE_BINARY_DIR}/wireshark.pc"
DESTINATION
Fix wireshark.pc install destination Change-Id: I136d654ac5ea54237494d9b61c3ddb445b0720ae Reviewed-on: https://code.wireshark.org/review/1863 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-29 12:07:44 +00:00
${CMAKE_INSTALL_LIBDIR}/pkgconfig
Add pkg-config file Change-Id: Ia55a2e560aef8d2f9a3cede18af4555507656047 Reviewed-on: https://code.wireshark.org/review/500 Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-03-04 13:59:39 +00:00
)
CMake: - Add opcua to the list of plugins to build - Link the gtk stuff statically into wireshark - Beginnings of "make install" - Change a few things about install paths svn path=/trunk/; revision=30029
2009-09-21 00:19:07 +00:00
install(
DIRECTORY
${INSTALL_DIRS}
CMake: Install the HTML guides. Add a "FileInstall.cmake" module that installs files and directories. Use it to install the chunked HTML guides. Install the guides into CMAKE_INSTALL_FULL_DOCDIR. By default this is /usr/local/share/doc/Wireshark. Define DOC_DIR to match. Add explicit file and directory permissions to the default install targets. Remove the PDF install target. Bug: 14258 Change-Id: I4712a4047a54627b7520b5bf5f191e0761d19606 Reviewed-on: https://code.wireshark.org/review/25737 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-11 22:34:04 +00:00
DESTINATION
CMake: Simplify CMAKE_INSTALL_DATADIR usage Change-Id: I414aa551b8e9315a654f4da62b882e787d4f6d53 Reviewed-on: https://code.wireshark.org/review/30904 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-12-03 19:23:35 +00:00
${CMAKE_INSTALL_DATADIR}
CMake: Install the HTML guides. Add a "FileInstall.cmake" module that installs files and directories. Use it to install the chunked HTML guides. Install the guides into CMAKE_INSTALL_FULL_DOCDIR. By default this is /usr/local/share/doc/Wireshark. Define DOC_DIR to match. Add explicit file and directory permissions to the default install targets. Remove the PDF install target. Bug: 14258 Change-Id: I4712a4047a54627b7520b5bf5f191e0761d19606 Reviewed-on: https://code.wireshark.org/review/25737 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-11 22:34:04 +00:00
FILE_PERMISSIONS
OWNER_WRITE OWNER_READ
GROUP_READ
WORLD_READ
- Previous patch moved the intall targes dirs too far down. - Install some auxiliary files (AUTHORS-SHORT, manuf, ...) svn path=/trunk/; revision=30135
2009-09-25 02:50:48 +00:00
DIRECTORY_PERMISSIONS
OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_READ
WORLD_EXECUTE WORLD_READ
Replace "svn" with "git" all over the place. Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. Rename "svnversion.h" to "version.h" as Evan suggested. Update some URLs. In make-version.pl, make sure we don't set an improper upstream branch name. Use the number of commits + short hash from `git describe` for package names by default. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-07 19:14:52 +00:00
PATTERN ".git" EXCLUDE
CMake: - Add opcua to the list of plugins to build - Link the gtk stuff statically into wireshark - Beginnings of "make install" - Change a few things about install paths svn path=/trunk/; revision=30029
2009-09-21 00:19:07 +00:00
PATTERN ".svn" EXCLUDE
PATTERN "Makefile.*" EXCLUDE
)
- Add a comment how to improve the output of supported features later on. - Move docbook pdf installation to toplevel. svn path=/trunk/; revision=40840
2012-02-04 14:19:38 +00:00
CMake: Change some install() paths to match NSIS package Currently our Windows code looks for data files in the same folder as the binary executable (presumably to make the application relocatable, although it should be possible to improve this with relative paths?). Ping-Bug: 15301 Change-Id: I0fef4e87dc9d1d8edef81dd11755761fddd0fd12 Reviewed-on: https://code.wireshark.org/review/30819 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-11-23 20:39:51 +00:00
if(WIN32)
# Note: CMake export mechanism misbehaves with a '.' in the
# path (incorrect relative path computation).
set(WIRESHARK_INSTALL_CMAKEDIR "cmake")
else()
CMake: Fix DOCDIR on Unix User guides are installed to doc/Wireshark. Use doc/wireshark instead. Remove leftover variable CPACK_PACKAGE_NAME. Change-Id: I9a1d6bdc7d8f0b48c61e43679285d5ba83904a63 Reviewed-on: https://code.wireshark.org/review/31851 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-02-01 16:25:24 +00:00
set(WIRESHARK_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake")
CMake: Change some install() paths to match NSIS package Currently our Windows code looks for data files in the same folder as the binary executable (presumably to make the application relocatable, although it should be possible to improve this with relative paths?). Ping-Bug: 15301 Change-Id: I0fef4e87dc9d1d8edef81dd11755761fddd0fd12 Reviewed-on: https://code.wireshark.org/review/30819 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-11-23 20:39:51 +00:00
endif()
Add cmake helper files for finding wireshark These files make it possible to use the cmake command find_package(Wirehark) to obtain information about the wireshark installation. Change-Id: I5af7c4e7b53b99cd473e04905a92bac267cd9b83 Reviewed-on: https://code.wireshark.org/review/5235 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-11 13:41:01 +00:00
install(
FILES
Cmake: Qt6 extends CMAKE_MODULE_PATH, work around this
2021-11-17 10:57:24 +00:00
# Qt6 extends CMAKE_MODULE_PATH, so use our local version
${WS_CMAKE_MODULE_PATH}/FindGLIB2.cmake
${WS_CMAKE_MODULE_PATH}/FindWSLibrary.cmake
${WS_CMAKE_MODULE_PATH}/FindWSWinLibs.cmake
${WS_CMAKE_MODULE_PATH}/UseAsn2Wrs.cmake
${WS_CMAKE_MODULE_PATH}/LocatePythonModule.cmake
${WS_CMAKE_MODULE_PATH}/UseMakePluginReg.cmake
Add cmake helper files for finding wireshark These files make it possible to use the cmake command find_package(Wirehark) to obtain information about the wireshark installation. Change-Id: I5af7c4e7b53b99cd473e04905a92bac267cd9b83 Reviewed-on: https://code.wireshark.org/review/5235 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-11 13:41:01 +00:00
DESTINATION
CMake: Change some install() paths to match NSIS package Currently our Windows code looks for data files in the same folder as the binary executable (presumably to make the application relocatable, although it should be possible to improve this with relative paths?). Ping-Bug: 15301 Change-Id: I0fef4e87dc9d1d8edef81dd11755761fddd0fd12 Reviewed-on: https://code.wireshark.org/review/30819 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-11-23 20:39:51 +00:00
${WIRESHARK_INSTALL_CMAKEDIR}
Add cmake helper files for finding wireshark These files make it possible to use the cmake command find_package(Wirehark) to obtain information about the wireshark installation. Change-Id: I5af7c4e7b53b99cd473e04905a92bac267cd9b83 Reviewed-on: https://code.wireshark.org/review/5235 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-11 13:41:01 +00:00
)
CMake: Modernize config-file package support A CMake config-file package provides support for downstreams using CMake and Wireshark libraries to easily configure the libwireshark dependency with: find_package(Wireshark CONFIG [REQUIRED]) target_link_libraries(foo epan) The FindWireshark.cmake file is no longer needed. See cmake-package(7) for more details on CMake's package system. Change-Id: Ie8af1d44417a99dd08d37959f7b2ffca88572ec2 Reviewed-on: https://code.wireshark.org/review/29208 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-23 21:03:28 +00:00
include(CMakePackageConfigHelpers)
configure_package_config_file(WiresharkConfig.cmake.in
${CMAKE_BINARY_DIR}/WiresharkConfig.cmake
CMake: Change some install() paths to match NSIS package Currently our Windows code looks for data files in the same folder as the binary executable (presumably to make the application relocatable, although it should be possible to improve this with relative paths?). Ping-Bug: 15301 Change-Id: I0fef4e87dc9d1d8edef81dd11755761fddd0fd12 Reviewed-on: https://code.wireshark.org/review/30819 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-11-23 20:39:51 +00:00
INSTALL_DESTINATION ${WIRESHARK_INSTALL_CMAKEDIR}
CMake: Modernize config-file package support A CMake config-file package provides support for downstreams using CMake and Wireshark libraries to easily configure the libwireshark dependency with: find_package(Wireshark CONFIG [REQUIRED]) target_link_libraries(foo epan) The FindWireshark.cmake file is no longer needed. See cmake-package(7) for more details on CMake's package system. Change-Id: Ie8af1d44417a99dd08d37959f7b2ffca88572ec2 Reviewed-on: https://code.wireshark.org/review/29208 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-23 21:03:28 +00:00
PATH_VARS
CMAKE_INSTALL_LIBDIR
CMAKE_INSTALL_INCLUDEDIR
PLUGIN_INSTALL_VERSION_LIBDIR
EXTCAP_INSTALL_LIBDIR
)
write_basic_package_version_file(
${CMAKE_BINARY_DIR}/WiresharkConfigVersion.cmake
COMPATIBILITY AnyNewerVersion
)
CMake: Generate cmake target exports on Windows CMake requires zlib to be added to the exports via epan and wiretap targets. Ping-Bug: 15301 Change-Id: I5cfe746e67c195eb83b1d159a2cc2a645c8c47ea Reviewed-on: https://code.wireshark.org/review/30793 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-11-23 20:39:47 +00:00
install(
FILES
${CMAKE_BINARY_DIR}/WiresharkConfig.cmake
${CMAKE_BINARY_DIR}/WiresharkConfigVersion.cmake
DESTINATION
${WIRESHARK_INSTALL_CMAKEDIR}
)
CMake: Modernize config-file package support A CMake config-file package provides support for downstreams using CMake and Wireshark libraries to easily configure the libwireshark dependency with: find_package(Wireshark CONFIG [REQUIRED]) target_link_libraries(foo epan) The FindWireshark.cmake file is no longer needed. See cmake-package(7) for more details on CMake's package system. Change-Id: Ie8af1d44417a99dd08d37959f7b2ffca88572ec2 Reviewed-on: https://code.wireshark.org/review/29208 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-23 21:03:28 +00:00
CMake: Generate cmake target exports on Windows CMake requires zlib to be added to the exports via epan and wiretap targets. Ping-Bug: 15301 Change-Id: I5cfe746e67c195eb83b1d159a2cc2a645c8c47ea Reviewed-on: https://code.wireshark.org/review/30793 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-11-23 20:39:47 +00:00
install(EXPORT WiresharkTargets
DESTINATION ${WIRESHARK_INSTALL_CMAKEDIR}
)
CMake: Modernize config-file package support A CMake config-file package provides support for downstreams using CMake and Wireshark libraries to easily configure the libwireshark dependency with: find_package(Wireshark CONFIG [REQUIRED]) target_link_libraries(foo epan) The FindWireshark.cmake file is no longer needed. See cmake-package(7) for more details on CMake's package system. Change-Id: Ie8af1d44417a99dd08d37959f7b2ffca88572ec2 Reviewed-on: https://code.wireshark.org/review/29208 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-08-23 21:03:28 +00:00
Switch the Doxygen API reference build to CMake. Switch to a single Doyxgen configuration which was generated using a recent version of Doxygen and customized to suit our needs. Add wsar_html and wsar_html_zip targets to CMake. Update some Doxygen markup and documentation as needed. Change-Id: Ic8a424b292c35a26f74ae0b53322265683e56e69 Reviewed-on: https://code.wireshark.org/review/26976 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16 21:49:55 +00:00
if (DOXYGEN_EXECUTABLE)
# API reference
CMake: API reference fixes. Fixup a dependency and make sure we create the API reference from scratch. Change-Id: I832d1772eb8b4f07cab6f04d164cac10c70ab3bb Reviewed-on: https://code.wireshark.org/review/26990 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-17 17:28:37 +00:00
# We don't have a good way of tracking dependencies, so we simply
# recreate the whole thing from scratch each time.
Switch the Doxygen API reference build to CMake. Switch to a single Doyxgen configuration which was generated using a recent version of Doxygen and customized to suit our needs. Add wsar_html and wsar_html_zip targets to CMake. Update some Doxygen markup and documentation as needed. Change-Id: Ic8a424b292c35a26f74ae0b53322265683e56e69 Reviewed-on: https://code.wireshark.org/review/26976 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16 21:49:55 +00:00
add_custom_target(wsar_html
CMake: API reference fixes. Fixup a dependency and make sure we create the API reference from scratch. Change-Id: I832d1772eb8b4f07cab6f04d164cac10c70ab3bb Reviewed-on: https://code.wireshark.org/review/26990 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-17 17:28:37 +00:00
COMMAND ${CMAKE_COMMAND} -E remove_directory wsar_html
Switch the Doxygen API reference build to CMake. Switch to a single Doyxgen configuration which was generated using a recent version of Doxygen and customized to suit our needs. Add wsar_html and wsar_html_zip targets to CMake. Update some Doxygen markup and documentation as needed. Change-Id: Ic8a424b292c35a26f74ae0b53322265683e56e69 Reviewed-on: https://code.wireshark.org/review/26976 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16 21:49:55 +00:00
COMMAND ${DOXYGEN_EXECUTABLE} doxygen.cfg
)
Docs: Ensure that the API reference has the proper permissions. Set our file permissions before building the wsar_html_zip target. Change-Id: I660bf87891a0c8bbebfd497984617bd1d294bf10 Reviewed-on: https://code.wireshark.org/review/35685 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-01-07 20:38:21 +00:00
if (WIN32)
add_custom_target(wsar_html_perms DEPENDS wsar_html)
else()
add_custom_target(wsar_html_perms
COMMAND find wsar_html
-type d
-exec chmod 755 "{}" +
COMMAND find wsar_html
-type f
-exec chmod 644 "{}" +
DEPENDS wsar_html)
endif()
Switch the Doxygen API reference build to CMake. Switch to a single Doyxgen configuration which was generated using a recent version of Doxygen and customized to suit our needs. Add wsar_html and wsar_html_zip targets to CMake. Update some Doxygen markup and documentation as needed. Change-Id: Ic8a424b292c35a26f74ae0b53322265683e56e69 Reviewed-on: https://code.wireshark.org/review/26976 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16 21:49:55 +00:00
add_custom_target(wsar_html_zip
COMMAND ${CMAKE_COMMAND} -E tar "cfv" "wsar_html.zip" --format=zip wsar_html
Docs: Ensure that the API reference has the proper permissions. Set our file permissions before building the wsar_html_zip target. Change-Id: I660bf87891a0c8bbebfd497984617bd1d294bf10 Reviewed-on: https://code.wireshark.org/review/35685 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-01-07 20:38:21 +00:00
DEPENDS wsar_html_perms
Switch the Doxygen API reference build to CMake. Switch to a single Doyxgen configuration which was generated using a recent version of Doxygen and customized to suit our needs. Add wsar_html and wsar_html_zip targets to CMake. Update some Doxygen markup and documentation as needed. Change-Id: Ic8a424b292c35a26f74ae0b53322265683e56e69 Reviewed-on: https://code.wireshark.org/review/26976 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16 21:49:55 +00:00
)
CMake: Doxygen and API reference target updates. The DOXYGEN_* variables which we use to create doxygen.cfg are native paths and are not compatible with Cygwin. We could try to make them compatible, but given that we're trying to migrate away from Cygwin set "DOXYGEN_EXECUTABLE" to "DOXYGEN_EXECUTABLE-NOTFOUND" if "cyg" is anywhere in its path. Add the wsar_html* targets to "Docs" and exclude them from Visual Studio's default build. Change-Id: Id23a3c43a9f4f1edb2d827bbf36a3a7eb64f0212 Reviewed-on: https://code.wireshark.org/review/27100 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-23 15:31:25 +00:00
set_target_properties(wsar_html wsar_html_zip PROPERTIES
CMake: Place all of the documentation in the "Documentation" folder.
2021-10-20 22:23:19 +00:00
FOLDER "Documentation"
CMake: Doxygen and API reference target updates. The DOXYGEN_* variables which we use to create doxygen.cfg are native paths and are not compatible with Cygwin. We could try to make them compatible, but given that we're trying to migrate away from Cygwin set "DOXYGEN_EXECUTABLE" to "DOXYGEN_EXECUTABLE-NOTFOUND" if "cyg" is anywhere in its path. Add the wsar_html* targets to "Docs" and exclude them from Visual Studio's default build. Change-Id: Id23a3c43a9f4f1edb2d827bbf36a3a7eb64f0212 Reviewed-on: https://code.wireshark.org/review/27100 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-23 15:31:25 +00:00
EXCLUDE_FROM_DEFAULT_BUILD True
)
Switch the Doxygen API reference build to CMake. Switch to a single Doyxgen configuration which was generated using a recent version of Doxygen and customized to suit our needs. Add wsar_html and wsar_html_zip targets to CMake. Update some Doxygen markup and documentation as needed. Change-Id: Ic8a424b292c35a26f74ae0b53322265683e56e69 Reviewed-on: https://code.wireshark.org/review/26976 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16 21:49:55 +00:00
endif(DOXYGEN_EXECUTABLE)
CMake: Exclude test targets from the default build. For the Visual Studio generator, setting the EXCLUDE_FROM_ALL property on a target excludes it from ALL_BUILD.vcxproj, but we additionally need to set EXCLUDE_FROM_DEFAULT_BUILD to exclude it from Wireshark.sln. Do so for the test targets. Change-Id: Icd328f75d4927e5b7bb65b1833da4724f63476b6 Reviewed-on: https://code.wireshark.org/review/26345 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-07 19:35:33 +00:00
add_custom_target(test-programs
Test: Remove the Bash test scripts. They've been replaced by the Python scripts. Change-Id: I8add9c9ea0a6bdd68b2fa3841977863c0ea9a761 Reviewed-on: https://code.wireshark.org/review/27243 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-01 22:49:11 +00:00
DEPENDS exntest
CMake: Exclude test targets from the default build. For the Visual Studio generator, setting the EXCLUDE_FROM_ALL property on a target excludes it from ALL_BUILD.vcxproj, but we additionally need to set EXCLUDE_FROM_DEFAULT_BUILD to exclude it from Wireshark.sln. Do so for the test targets. Change-Id: Icd328f75d4927e5b7bb65b1833da4724f63476b6 Reviewed-on: https://code.wireshark.org/review/26345 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-07 19:35:33 +00:00
oids_test
reassemble_test
tvbtest
wmem_test
COSE dissector from dtn-wireshark project
2021-05-11 03:50:41 +00:00
wscbor_test
wsutil: Start adding a test suite
2021-06-21 21:36:45 +00:00
test_wsutil
CMake: Exclude test targets from the default build. For the Visual Studio generator, setting the EXCLUDE_FROM_ALL property on a target excludes it from ALL_BUILD.vcxproj, but we additionally need to set EXCLUDE_FROM_DEFAULT_BUILD to exclude it from Wireshark.sln. Do so for the test targets. Change-Id: Icd328f75d4927e5b7bb65b1833da4724f63476b6 Reviewed-on: https://code.wireshark.org/review/26345 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-07 19:35:33 +00:00
COMMENT "Building unit test programs and wrapper"
)
set_target_properties(test-programs PROPERTIES
FOLDER "Tests"
EXCLUDE_FROM_DEFAULT_BUILD True
)
Create perl script to append existing AUTHORS file with information from git log. new AUTHORS file can be created with "gen-authors" build parameter The "original" AUTHORS file has been fixed up to be kind to parsers (so no one gets excluded) and renamed to AUTHORS.src. This preserves the features authors worked on. For authors that didn't list features, they may be converted to just getting information from git. Change-Id: I9a4c4091e229f7f5e1c46d864527a98c1278e451 Reviewed-on: https://code.wireshark.org/review/14231 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-28 22:32:13 +00:00
Start porting our test scripts to Python. Add ctest support. Create Python versions of our various test shell scripts. Add CMake tests for each suite. Tests can now be run directly via test.py, via the "test" target, or via ctest, e.g. ctest --verbose --jobs 3 Add a testing chapter to the Developer's Guide. Add a way to disable ctest in dpkg-buildpackage. Suites completed: - capture - clopts - decryption - dissection Remaining suites: - fileformats - io - mergecap - nameres - text2pcap - unittests - wslua Change-Id: I8936e05edefc76a86b6a7a5da302e7461bbdda0f Reviewed-on: https://code.wireshark.org/review/27134 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-03 00:12:23 +00:00
# Test suites
enable_testing()
Test: Make sure we run our display filter tests. Change the test suite list in CMakeLists.txt to a static list. Add a CTest coverage unit test. Change-Id: I8459f320a2d0707618d6d56abdfce80274fddd2d Reviewed-on: https://code.wireshark.org/review/27377 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-05 22:53:54 +00:00
# We could try to build this list dynamically, but given that we tend to
# go years between adding suites just run
Test+CMake: Make our test grouping more fine-grained. Split our tests by suite_*.group_* instead of suite_*. There are quite a few dfilter tests and this should make them more parallelizable. Change-Id: I52371409618cda70dc99811e8de1fb1ad9d9a3b6 Reviewed-on: https://code.wireshark.org/review/28329 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-18 19:01:01 +00:00
# test/test.py --list-groups | sort
Test: Make sure we run our display filter tests. Change the test suite list in CMakeLists.txt to a static list. Add a CTest coverage unit test. Change-Id: I8459f320a2d0707618d6d56abdfce80274fddd2d Reviewed-on: https://code.wireshark.org/review/27377 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-05 22:53:54 +00:00
# and paste the output here.
Test+CMake: Make our test grouping more fine-grained. Split our tests by suite_*.group_* instead of suite_*. There are quite a few dfilter tests and this should make them more parallelizable. Change-Id: I52371409618cda70dc99811e8de1fb1ad9d9a3b6 Reviewed-on: https://code.wireshark.org/review/28329 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-18 19:01:01 +00:00
set(_test_group_list
Test: Make sure we run our display filter tests. Change the test suite list in CMakeLists.txt to a static list. Add a CTest coverage unit test. Change-Id: I8459f320a2d0707618d6d56abdfce80274fddd2d Reviewed-on: https://code.wireshark.org/review/27377 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-05 22:53:54 +00:00
suite_capture
suite_clopts
suite_decryption
Test+CMake: Make our test grouping more fine-grained. Split our tests by suite_*.group_* instead of suite_*. There are quite a few dfilter tests and this should make them more parallelizable. Change-Id: I52371409618cda70dc99811e8de1fb1ad9d9a3b6 Reviewed-on: https://code.wireshark.org/review/28329 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-18 19:01:01 +00:00
suite_dfilter.group_bytes_ether
suite_dfilter.group_bytes_ipv6
suite_dfilter.group_bytes_type
suite_dfilter.group_double
dfilter: Add max()/min() tests and documentation
2022-04-13 13:07:01 +00:00
suite_dfilter.group_function
Test+CMake: Make our test grouping more fine-grained. Split our tests by suite_*.group_* instead of suite_*. There are quite a few dfilter tests and this should make them more parallelizable. Change-Id: I52371409618cda70dc99811e8de1fb1ad9d9a3b6 Reviewed-on: https://code.wireshark.org/review/28329 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-18 19:01:01 +00:00
suite_dfilter.group_integer
suite_dfilter.group_integer_1byte
suite_dfilter.group_ipv4
suite_dfilter.group_membership
dfilter: Allow existence check for slices Allow checking if a slice exists. The result is true if the slice has length greater than zero. The len() function is implemented as a DFVM instruction instead. The semantics are the same.
2022-07-03 22:07:36 +00:00
suite_dfilter.group_slice
Test+CMake: Make our test grouping more fine-grained. Split our tests by suite_*.group_* instead of suite_*. There are quite a few dfilter tests and this should make them more parallelizable. Change-Id: I52371409618cda70dc99811e8de1fb1ad9d9a3b6 Reviewed-on: https://code.wireshark.org/review/28329 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-18 19:01:01 +00:00
suite_dfilter.group_scanner
suite_dfilter.group_string_type
suite_dfilter.group_stringz
dfilter: Add some more syntax tests
2021-10-01 16:44:23 +00:00
suite_dfilter.group_syntax
Test+CMake: Make our test grouping more fine-grained. Split our tests by suite_*.group_* instead of suite_*. There are quite a few dfilter tests and this should make them more parallelizable. Change-Id: I52371409618cda70dc99811e8de1fb1ad9d9a3b6 Reviewed-on: https://code.wireshark.org/review/28329 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-18 19:01:01 +00:00
suite_dfilter.group_time_relative
suite_dfilter.group_time_type
suite_dfilter.group_tvb
suite_dfilter.group_uint64
Test: Make sure we run our display filter tests. Change the test suite list in CMakeLists.txt to a static list. Add a CTest coverage unit test. Change-Id: I8459f320a2d0707618d6d56abdfce80274fddd2d Reviewed-on: https://code.wireshark.org/review/27377 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-05 22:53:54 +00:00
suite_dissection
Added a generic dissector validator and some ASTERIX unit tests that use it. This patch extends the test suite with: * a way for tests to check if a given byte sequence dissects into an expected dissection result. Unit tests included: * ASTERIX I019 * ASTERIX I063 * ASTERIX I065 Change-Id: Ib168382ec15b0b610ff5913806120ba1bf1d1503 Reviewed-on: https://code.wireshark.org/review/31083 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-25 14:13:40 +00:00
suite_dissectors.group_asterix
test: add suite_extcaps. All the shipped extcaps will be tested against: --help --extcap-interfaces --extcap-interface <IFACE> --extcap-dtls --extcap-interface <IFACE> --extcap-config Bug: 16268 Change-Id: I7949103940c95c9c23fc5dd3743c15995d3a152d Reviewed-on: https://code.wireshark.org/review/35409 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-12-10 22:47:17 +00:00
suite_extcaps
Test: Make sure we run our display filter tests. Change the test suite list in CMakeLists.txt to a static list. Add a CTest coverage unit test. Change-Id: I8459f320a2d0707618d6d56abdfce80274fddd2d Reviewed-on: https://code.wireshark.org/review/27377 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-05 22:53:54 +00:00
suite_fileformats
tests: add regression tests for Follow TCP Stream Verified that the tests failed without the fixes for the linked bugs. The tests have full statement coverage(*1) for check_follow_fragments and follow_tcp_tap_listener. For details and Scapy script, see: https://git.lekensteyn.nl/peter/wireshark-notes/commit/crafted-pkt/badsegments.py?id=4ecf9d858b49e76d8a9c29df01ce1bd523ae6704 (*1) except for `if (data_length <= data_offset) { data_length = 0; }` Change-Id: I625536df375272cf6c9116231194c39df1217fae Ping-Bug: 13700 Ping-Bug: 14944 Reviewed-on: https://code.wireshark.org/review/28618 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-07-05 23:57:44 +00:00
suite_follow
Added "Follow DCCP stream" feature. This pull request includes: * The "Follow DCCP stream" feature. * Updated docbook documentation for the "Follow DCCP stream" feature. * Test for the feature. * Corresponding packet trace for the test.
2021-02-22 11:48:46 +00:00
suite_follow_dccp
HTTP2, QUIC: fix "Follow Stream" "Follow Stream" functionality assumes that all data in a single packet belongs to the same stream. That is not true for HTTP2 and QUIC, where we end up having data from unrelated streams. Filter out the unwanted data directly in the protocol dissector code with a custom `tap_handler` (as TCP already does). Close #16093
2021-06-28 11:58:36 +00:00
suite_follow_multistream
Test: Make sure we run our display filter tests. Change the test suite list in CMakeLists.txt to a static list. Add a CTest coverage unit test. Change-Id: I8459f320a2d0707618d6d56abdfce80274fddd2d Reviewed-on: https://code.wireshark.org/review/27377 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-05 22:53:54 +00:00
suite_io
suite_mergecap
Added NetPerfMeter test suite.
2021-02-21 17:23:27 +00:00
suite_netperfmeter
Test: Make sure we run our display filter tests. Change the test suite list in CMakeLists.txt to a static list. Add a CTest coverage unit test. Change-Id: I8459f320a2d0707618d6d56abdfce80274fddd2d Reviewed-on: https://code.wireshark.org/review/27377 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-05 22:53:54 +00:00
suite_nameres
test: add suite_outputformats for json output regression testing. This suite uses different output formats to check against fixed samples. Change-Id: I8adccfefea35a6d3cfacf3da61e8a72d830ed3a0 Reviewed-on: https://code.wireshark.org/review/31056 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-12-15 20:25:40 +00:00
suite_outputformats
Test+Qt: Add an automatic update check. Add software_update_info() to the software update module, which returns the name of our update library if we have one. Use it to add automatic update information to the compiled information in `wireshark --version`. Add a "release" test suite, which contains a test for automatic updates. Ping-Bug: 16381 Change-Id: I867a96bdcfde8be541eca2dc0e84b5000276e7dd Reviewed-on: https://code.wireshark.org/review/36107 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-02-13 23:18:14 +00:00
suite_release
Test: Make sure we run our display filter tests. Change the test suite list in CMakeLists.txt to a static list. Add a CTest coverage unit test. Change-Id: I8459f320a2d0707618d6d56abdfce80274fddd2d Reviewed-on: https://code.wireshark.org/review/27377 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-05 22:53:54 +00:00
suite_text2pcap
Test: Add sharkd tests. Change-Id: I0e5049700ab9285196ce6b4567bd2d034529e763 Reviewed-on: https://code.wireshark.org/review/28327 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-18 18:01:31 +00:00
suite_sharkd
Test: Make sure we run our display filter tests. Change the test suite list in CMakeLists.txt to a static list. Add a CTest coverage unit test. Change-Id: I8459f320a2d0707618d6d56abdfce80274fddd2d Reviewed-on: https://code.wireshark.org/review/27377 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-05 22:53:54 +00:00
suite_unittests
suite_wslua
)
Start porting our test scripts to Python. Add ctest support. Create Python versions of our various test shell scripts. Add CMake tests for each suite. Tests can now be run directly via test.py, via the "test" target, or via ctest, e.g. ctest --verbose --jobs 3 Add a testing chapter to the Developer's Guide. Add a way to disable ctest in dpkg-buildpackage. Suites completed: - capture - clopts - decryption - dissection Remaining suites: - fileformats - io - mergecap - nameres - text2pcap - unittests - wslua Change-Id: I8936e05edefc76a86b6a7a5da302e7461bbdda0f Reviewed-on: https://code.wireshark.org/review/27134 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-03 00:12:23 +00:00
Test: Make sure we run our display filter tests. Change the test suite list in CMakeLists.txt to a static list. Add a CTest coverage unit test. Change-Id: I8459f320a2d0707618d6d56abdfce80274fddd2d Reviewed-on: https://code.wireshark.org/review/27377 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-05 22:53:54 +00:00
# We don't currently handle spaces in arguments. On Windows this
Start porting our test scripts to Python. Add ctest support. Create Python versions of our various test shell scripts. Add CMake tests for each suite. Tests can now be run directly via test.py, via the "test" target, or via ctest, e.g. ctest --verbose --jobs 3 Add a testing chapter to the Developer's Guide. Add a way to disable ctest in dpkg-buildpackage. Suites completed: - capture - clopts - decryption - dissection Remaining suites: - fileformats - io - mergecap - nameres - text2pcap - unittests - wslua Change-Id: I8936e05edefc76a86b6a7a5da302e7461bbdda0f Reviewed-on: https://code.wireshark.org/review/27134 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-03 00:12:23 +00:00
# means that you will probably have to pass in an interface index
# instead of a name.
set(TEST_EXTRA_ARGS "" CACHE STRING "Extra arguments to pass to test/test.py")
separate_arguments(TEST_EXTRA_ARGS)
Test+CMake: Make our test grouping more fine-grained. Split our tests by suite_*.group_* instead of suite_*. There are quite a few dfilter tests and this should make them more parallelizable. Change-Id: I52371409618cda70dc99811e8de1fb1ad9d9a3b6 Reviewed-on: https://code.wireshark.org/review/28329 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-18 19:01:01 +00:00
foreach(_group_name ${_test_group_list})
Start porting our test scripts to Python. Add ctest support. Create Python versions of our various test shell scripts. Add CMake tests for each suite. Tests can now be run directly via test.py, via the "test" target, or via ctest, e.g. ctest --verbose --jobs 3 Add a testing chapter to the Developer's Guide. Add a way to disable ctest in dpkg-buildpackage. Suites completed: - capture - clopts - decryption - dissection Remaining suites: - fileformats - io - mergecap - nameres - text2pcap - unittests - wslua Change-Id: I8936e05edefc76a86b6a7a5da302e7461bbdda0f Reviewed-on: https://code.wireshark.org/review/27134 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-03 00:12:23 +00:00
add_test(
Test+CMake: Make our test grouping more fine-grained. Split our tests by suite_*.group_* instead of suite_*. There are quite a few dfilter tests and this should make them more parallelizable. Change-Id: I52371409618cda70dc99811e8de1fb1ad9d9a3b6 Reviewed-on: https://code.wireshark.org/review/28329 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-18 19:01:01 +00:00
NAME ${_group_name}
Test: Be more paranoid about our log output. Run our CTest tests with PYTHONIOENCODING=UTF-8. If someone runs our tests manually and their output encoding isn't UTF-8, print replacement characters instead of failing with an error. Open our log files with "errors='backslashreplace'" in case their contents aren't UTF-8. Change-Id: Ifa4d12c2b5e272cf3903f3e0c6102e4d961562f1 Reviewed-on: https://code.wireshark.org/review/27686 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-21 16:02:26 +00:00
COMMAND ${CMAKE_COMMAND} -E env PYTHONIOENCODING=UTF-8
${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/test.py
test: Miscellaneous fixups. In util_slow_dhcp.py, open stdout as O_BINARY on Windows. Have ctest pass --verbose to test.py. Call config.canCapture at test time so that we don't inadvertently skip some tests. Stringify our dumpcap config check. Fix our Gcrypt variable. Change-Id: I884ec23ddfc7c28b79d4a860c6c43c308598e6db Reviewed-on: https://code.wireshark.org/review/27182 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-27 16:35:37 +00:00
--verbose
CMake: Fix tests. Pass $<TARGET_FILE_DIR:wmem_test> to test.py, which should be the path for all of our built executables, instead of ...:tshark, which is the path for *some* of our built executables on macOS.
2021-09-01 16:31:07 +00:00
--program-path $<TARGET_FILE_DIR:wmem_test>
Start porting our test scripts to Python. Add ctest support. Create Python versions of our various test shell scripts. Add CMake tests for each suite. Tests can now be run directly via test.py, via the "test" target, or via ctest, e.g. ctest --verbose --jobs 3 Add a testing chapter to the Developer's Guide. Add a way to disable ctest in dpkg-buildpackage. Suites completed: - capture - clopts - decryption - dissection Remaining suites: - fileformats - io - mergecap - nameres - text2pcap - unittests - wslua Change-Id: I8936e05edefc76a86b6a7a5da302e7461bbdda0f Reviewed-on: https://code.wireshark.org/review/27134 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-03 00:12:23 +00:00
${TEST_EXTRA_ARGS}
Test+CMake: Make our test grouping more fine-grained. Split our tests by suite_*.group_* instead of suite_*. There are quite a few dfilter tests and this should make them more parallelizable. Change-Id: I52371409618cda70dc99811e8de1fb1ad9d9a3b6 Reviewed-on: https://code.wireshark.org/review/28329 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-18 19:01:01 +00:00
${_group_name}
Start porting our test scripts to Python. Add ctest support. Create Python versions of our various test shell scripts. Add CMake tests for each suite. Tests can now be run directly via test.py, via the "test" target, or via ctest, e.g. ctest --verbose --jobs 3 Add a testing chapter to the Developer's Guide. Add a way to disable ctest in dpkg-buildpackage. Suites completed: - capture - clopts - decryption - dissection Remaining suites: - fileformats - io - mergecap - nameres - text2pcap - unittests - wslua Change-Id: I8936e05edefc76a86b6a7a5da302e7461bbdda0f Reviewed-on: https://code.wireshark.org/review/27134 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-03 00:12:23 +00:00
)
Test+CMake: Make our test grouping more fine-grained. Split our tests by suite_*.group_* instead of suite_*. There are quite a few dfilter tests and this should make them more parallelizable. Change-Id: I52371409618cda70dc99811e8de1fb1ad9d9a3b6 Reviewed-on: https://code.wireshark.org/review/28329 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-18 19:01:01 +00:00
set_tests_properties(${_group_name} PROPERTIES TIMEOUT 600)
Start porting our test scripts to Python. Add ctest support. Create Python versions of our various test shell scripts. Add CMake tests for each suite. Tests can now be run directly via test.py, via the "test" target, or via ctest, e.g. ctest --verbose --jobs 3 Add a testing chapter to the Developer's Guide. Add a way to disable ctest in dpkg-buildpackage. Suites completed: - capture - clopts - decryption - dissection Remaining suites: - fileformats - io - mergecap - nameres - text2pcap - unittests - wslua Change-Id: I8936e05edefc76a86b6a7a5da302e7461bbdda0f Reviewed-on: https://code.wireshark.org/review/27134 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-04-03 00:12:23 +00:00
endforeach()
test: allow running pytest without specifying the tests directory This allows `pytest` to be executed from the top-level source or build directory (or any other directory below). Change-Id: Ib7af2ea2aaf01319d6839d2dc67228fbb5a7bc34 Reviewed-on: https://code.wireshark.org/review/31370 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03 22:43:56 +00:00
# Make it possible to run pytest without passing the full path as argument.
if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/pytest.ini" pytest_ini)
string(REGEX REPLACE "\naddopts = ([^\n]+)"
"\naddopts = ${CMAKE_CURRENT_SOURCE_DIR}/test \\1"
pytest_ini "${pytest_ini}")
file(WRITE "${CMAKE_BINARY_DIR}/pytest.ini" "${pytest_ini}")
endif()
CMake: Avoid pipes and the `cut` command. Dump the output of `git shortlog` directly to AUTHORS.git instead of piping it through `cut`. Depending on our toolchain, cmake COMMANDs might not support pipes. This appears to be the case for MSBuild. Removing the `cut` command has the added benefit of reducing our dependency on Cygwin. Pass HEAD to `git shortlog`, otherwise it doesn't return anything when run under MSBuild. Change-Id: I23e9436c007d76a700bbbc45c2772c8aba6d5749 Reviewed-on: https://code.wireshark.org/review/14349 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-04 17:55:40 +00:00
if (GIT_EXECUTABLE)
Fix out-of-tree "gen-authors" target Change directory to the source tree before invoking `git shortlog`, otherwise it fails on build directories outside the source tree. Alexis suggested to move the git invocation to the perl script, this is done now and also avoids writing AUTHORS.git in the source tree. Change-Id: I5905ebf40d8d32a586c88671b52f28c542ca33ba Reviewed-on: https://code.wireshark.org/review/14660 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-03-27 21:31:36 +00:00
# Update AUTHORS file with entries from git shortlog
add_custom_target(
CMake: Avoid pipes and the `cut` command. Dump the output of `git shortlog` directly to AUTHORS.git instead of piping it through `cut`. Depending on our toolchain, cmake COMMANDs might not support pipes. This appears to be the case for MSBuild. Removing the `cut` command has the added benefit of reducing our dependency on Cygwin. Pass HEAD to `git shortlog`, otherwise it doesn't return anything when run under MSBuild. Change-Id: I23e9436c007d76a700bbbc45c2772c8aba6d5749 Reviewed-on: https://code.wireshark.org/review/14349 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-04 17:55:40 +00:00
gen-authors
Tools: Port tools/generate_authors.py to Python3. Port the script that creates AUTHORS to Python3. Ping #18152.
2022-06-23 21:07:22 +00:00
COMMAND ${PYTHON_EXECUTABLE} tools/generate_authors.py AUTHORS.src > AUTHORS
Fix out-of-tree "gen-authors" target Change directory to the source tree before invoking `git shortlog`, otherwise it fails on build directories outside the source tree. Alexis suggested to move the git invocation to the perl script, this is done now and also avoids writing AUTHORS.git in the source tree. Change-Id: I5905ebf40d8d32a586c88671b52f28c542ca33ba Reviewed-on: https://code.wireshark.org/review/14660 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-03-27 21:31:36 +00:00
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
CMake: Avoid pipes and the `cut` command. Dump the output of `git shortlog` directly to AUTHORS.git instead of piping it through `cut`. Depending on our toolchain, cmake COMMANDs might not support pipes. This appears to be the case for MSBuild. Removing the `cut` command has the added benefit of reducing our dependency on Cygwin. Pass HEAD to `git shortlog`, otherwise it doesn't return anything when run under MSBuild. Change-Id: I23e9436c007d76a700bbbc45c2772c8aba6d5749 Reviewed-on: https://code.wireshark.org/review/14349 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-04 17:55:40 +00:00
)
else (GIT_EXECUTABLE)
Fix out-of-tree "gen-authors" target Change directory to the source tree before invoking `git shortlog`, otherwise it fails on build directories outside the source tree. Alexis suggested to move the git invocation to the perl script, this is done now and also avoids writing AUTHORS.git in the source tree. Change-Id: I5905ebf40d8d32a586c88671b52f28c542ca33ba Reviewed-on: https://code.wireshark.org/review/14660 Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-03-27 21:31:36 +00:00
add_custom_target( gen-authors COMMAND ${CMAKE_COMMAND} -E echo "Git not found." )
CMake: Avoid pipes and the `cut` command. Dump the output of `git shortlog` directly to AUTHORS.git instead of piping it through `cut`. Depending on our toolchain, cmake COMMANDs might not support pipes. This appears to be the case for MSBuild. Removing the `cut` command has the added benefit of reducing our dependency on Cygwin. Pass HEAD to `git shortlog`, otherwise it doesn't return anything when run under MSBuild. Change-Id: I23e9436c007d76a700bbbc45c2772c8aba6d5749 Reviewed-on: https://code.wireshark.org/review/14349 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-04 17:55:40 +00:00
endif (GIT_EXECUTABLE)
CMake: Place all of the documentation in the "Documentation" folder.
2021-10-20 22:23:19 +00:00
set_target_properties(gen-authors PROPERTIES FOLDER "Documentation")
CMake: Generate a wrapper for test.sh. Create a wrapper script that cd's to the test directory and execs test.sh. We need to handle build configurations so the path is a bit roundabout. Change-Id: I4c2a48c041bce2479422830110b1251b3f2c5a94 Reviewed-on: https://code.wireshark.org/review/7570 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-07 01:49:24 +00:00
CMake: Add a hardening-check target. On Windows, add a hardening-check target which checks for DYNAMICBASE and NXCOMPAT using the PowerShell script Get-HardenFlags.ps1. For a Visual Studio solution, run the check by calling: msbuild /m /p:Configuration=RelWithDebInfo hardening-check.vcxproj using the config as appropriate for your build. Otherwise if we find the Debian/Fedora hardening-check script add a target which runs it for each of our executables. Change-Id: I62263e81d155c66e8c8edc751ffab535bf9f3b96 Reviewed-on: https://code.wireshark.org/review/10641 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-24 17:42:46 +00:00
if (WIN32)
file (TO_NATIVE_PATH ${CMAKE_SOURCE_DIR}/tools/Get-HardenFlags.ps1 _win_harden_flags)
add_custom_target(hardening-check
Fix Windows hardening check The hardening check runs on all binaries and quite a few third party binaries are not hardened, thus leading to a warning on the buildslave. The change reduces the noise by not counting the binaries that are known to be "soft". They are still printed in the output though, for reference. Also fixed the search directory passed to the script. Change-Id: I1619066c687c9ba934ab38fccbbf2011108328e4 Reviewed-on: https://code.wireshark.org/review/12016 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2015-11-21 18:09:33 +00:00
COMMAND ${POWERSHELL_COMMAND} "${_win_harden_flags}" "${_dll_output_dir_win}"
CMake: Add a hardening-check target. On Windows, add a hardening-check target which checks for DYNAMICBASE and NXCOMPAT using the PowerShell script Get-HardenFlags.ps1. For a Visual Studio solution, run the check by calling: msbuild /m /p:Configuration=RelWithDebInfo hardening-check.vcxproj using the config as appropriate for your build. Otherwise if we find the Debian/Fedora hardening-check script add a target which runs it for each of our executables. Change-Id: I62263e81d155c66e8c8edc751ffab535bf9f3b96 Reviewed-on: https://code.wireshark.org/review/10641 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-24 17:42:46 +00:00
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."
)
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
if(HARDENING_CHECK_EXECUTABLE)
CMake: Add a hardening-check target. On Windows, add a hardening-check target which checks for DYNAMICBASE and NXCOMPAT using the PowerShell script Get-HardenFlags.ps1. For a Visual Studio solution, run the check by calling: msbuild /m /p:Configuration=RelWithDebInfo hardening-check.vcxproj using the config as appropriate for your build. Otherwise if we find the Debian/Fedora hardening-check script add a target which runs it for each of our executables. Change-Id: I62263e81d155c66e8c8edc751ffab535bf9f3b96 Reviewed-on: https://code.wireshark.org/review/10641 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-24 17:42:46 +00:00
foreach(_prog ${PROGLIST})
get_target_property(_prog_dir ${_prog} RUNTIME_OUTPUT_DIRECTORY)
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
if(NOT _prog_dir)
CMake: Add a hardening-check target. On Windows, add a hardening-check target which checks for DYNAMICBASE and NXCOMPAT using the PowerShell script Get-HardenFlags.ps1. For a Visual Studio solution, run the check by calling: msbuild /m /p:Configuration=RelWithDebInfo hardening-check.vcxproj using the config as appropriate for your build. Otherwise if we find the Debian/Fedora hardening-check script add a target which runs it for each of our executables. Change-Id: I62263e81d155c66e8c8edc751ffab535bf9f3b96 Reviewed-on: https://code.wireshark.org/review/10641 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-24 17:42:46 +00:00
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()
Add a test-programs target everywhere. Add a "test-programs" target to each toolchain which builds each unit test executable. "test-programs" must now be built before running the unit test suite. Change-Id: I9317a1e305d987f244c4bd8b4a7f05d11fed7090 Reviewed-on: https://code.wireshark.org/review/7673 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-13 16:21:01 +00:00
Add checkAPI calls to CMake. This generates a top level target, checkAPI, that is excluded from the ALL build target, so must be run separately. On Windows using a Visual Studio generator, call msbuild /p:Configuration=RelWithDebInfo checkAPI.vcxproj Change-Id: I44a57c564dcfc75499463b942436f4b920a82478 Reviewed-on: https://code.wireshark.org/review/14873 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-03-11 19:51:39 +00:00
CHECKAPI(
NAME
main
SWITCHES
SOURCES
${WIRESHARK_SRC}
${TSHARK_TAP_SRC}
)
Add an initial "shellcheck" target. Look for shellcheck in Autotools and CMake, and if found add a target that checks some of our shell scripts. Add a "source=" directive to targets that include test-common.sh so that shellcheck will correctly process the scripts. Note that this requires shellcheck 0.4.0 or later. To do: Fix the issues that shellcheck found and check more scripts. Change-Id: I441f9f59d8a3f8eec6718119c2370f2560b98f3c Reviewed-on: https://code.wireshark.org/review/17943 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-26 17:34:04 +00:00
find_program(SHELLCHECK_EXECUTABLE shellcheck
DOC "Path to the shellcheck utility."
)
CMake: require at least CMake 3.5 CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10 12:54:31 +00:00
if(SHELLCHECK_EXECUTABLE)
Add an initial "shellcheck" target. Look for shellcheck in Autotools and CMake, and if found add a target that checks some of our shell scripts. Add a "source=" directive to targets that include test-common.sh so that shellcheck will correctly process the scripts. Note that this requires shellcheck 0.4.0 or later. To do: Fix the issues that shellcheck found and check more scripts. Change-Id: I441f9f59d8a3f8eec6718119c2370f2560b98f3c Reviewed-on: https://code.wireshark.org/review/17943 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-26 17:34:04 +00:00
add_custom_target(shellcheck)
set_target_properties(shellcheck PROPERTIES FOLDER "Tests")
# --external-sources requires 0.4.0 or later.
Shellcheck fixes. Note that ChmodBPF requires a newer version of shellcheck. Fix an issue found after upgrading to 0.7.1.
2020-09-20 21:59:13 +00:00
# ChmodBPF uses "shellcheck shell=bash". Not sure which version
# added support for that.
Add an initial "shellcheck" target. Look for shellcheck in Autotools and CMake, and if found add a target that checks some of our shell scripts. Add a "source=" directive to targets that include test-common.sh so that shellcheck will correctly process the scripts. Note that this requires shellcheck 0.4.0 or later. To do: Fix the issues that shellcheck found and check more scripts. Change-Id: I441f9f59d8a3f8eec6718119c2370f2560b98f3c Reviewed-on: https://code.wireshark.org/review/17943 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-26 17:34:04 +00:00
add_custom_command(TARGET shellcheck POST_BUILD
COMMAND shellcheck --external-sources
Rename the "image" directory to "resources". The "image" directory contains resource compiler assets and other application resources, so name it "resources."
2022-03-06 22:16:36 +00:00
resources/stock_icons/svg-to-png.sh
Packaging: Add initial support for AppImage. Add an "appimage" target that will create an AppImage package. Current AppImage tools assume that you only have one executable, so add a custom AppRun wrapper that will let you run our associated CLI utilities via symlinks, e.g. ln -s ./Wireshark-3.2.1-x86.appimage capinfos ./capinfos --help Packaging requires both linuxdeployqt and appimagetool, although we might be able to reduce this to just linuxdeployqt: https://github.com/probonopd/linuxdeployqt https://github.com/AppImage/AppImageKit I haven't done much testing beyond running Wireshark and capinfos. There are undoubtedly issues that need to be fixed. Bug: 14464 Change-Id: Ic004ba1962e6a8630ebb017349d9b2c0462fd5fe Reviewed-on: https://code.wireshark.org/review/30953 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-12-07 01:23:54 +00:00
packaging/appimage/AppRun
macOS: Switch ChmodBPF to zsh. Switch the ChmodBPF script to /bin/zsh since it - Has known behavior, unlike /bin/sh, which execs whatever /private/var/select/sh points to. - Supports 'read -n 0' and other nice features. - Is unlikely to be deprecated, since it was made the default shell in Catalina[1]. - Exists in older macOS releases, unlike dash[2]. Closes #16826. [1]https://support.apple.com/en-us/HT208050 [2]https://scriptingosx.com/2020/06/about-bash-zsh-sh-and-dash-in-macos-catalina-and-beyond/
2020-09-16 18:47:10 +00:00
"packaging/macosx/ChmodBPF/root/Library/Application Support/Wireshark/ChmodBPF/ChmodBPF"
More shellcheck checks and fixes. Remove a libtool check while we're here. Change-Id: I813add2031480f34ce89f268b541f8939016c2c7 Reviewed-on: https://code.wireshark.org/review/28066 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-06 17:10:07 +00:00
packaging/macosx/osx-app.sh.in
macOS: Sign our .dmg. Add osx-dmg.sh back and make it a simple wrapper around dmgbuild and codesign. Change-Id: I0baa21fd971aa1b06e1a6700881cd7625dffff35 Reviewed-on: https://code.wireshark.org/review/34629 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-09-26 17:43:13 +00:00
packaging/macosx/osx-dmg.sh.in
tarball+RPM: Fetch our version from CMake. Move git-export-release.sh to packaging/source. Have the source and RPM packaging derive version information from CMake's VERSION variable. This brings them in line with the rest of our packaging and avoids having to read chicken entrails^W^Wgit output. Make sure we always generate wireshark.spec. Bug: 15359 Change-Id: I188efda489c94449a10a612abebf9c2872c305cb Reviewed-on: https://code.wireshark.org/review/31504 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-11 22:34:03 +00:00
packaging/source/git-export-release.sh.in
Fix shellcheck issues in debian-setup.sh. Change-Id: I54956ea4de5e07f1d2a705f9b77624d6c25511a6 Reviewed-on: https://code.wireshark.org/review/28438 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-25 22:39:30 +00:00
tools/debian-setup.sh
Add an initial "shellcheck" target. Look for shellcheck in Autotools and CMake, and if found add a target that checks some of our shell scripts. Add a "source=" directive to targets that include test-common.sh so that shellcheck will correctly process the scripts. Note that this requires shellcheck 0.4.0 or later. To do: Fix the issues that shellcheck found and check more scripts. Change-Id: I441f9f59d8a3f8eec6718119c2370f2560b98f3c Reviewed-on: https://code.wireshark.org/review/17943 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-26 17:34:04 +00:00
tools/fuzz-test.sh
More shellcheck fixes. Change-Id: Iee9e464b3935d4c8a09fa9954f73496eae33f30f Reviewed-on: https://code.wireshark.org/review/28092 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-07 22:03:48 +00:00
tools/gen-bugnote
tools/pre-commit
Add an initial "shellcheck" target. Look for shellcheck in Autotools and CMake, and if found add a target that checks some of our shell scripts. Add a "source=" directive to targets that include test-common.sh so that shellcheck will correctly process the scripts. Note that this requires shellcheck 0.4.0 or later. To do: Fix the issues that shellcheck found and check more scripts. Change-Id: I441f9f59d8a3f8eec6718119c2370f2560b98f3c Reviewed-on: https://code.wireshark.org/review/17943 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-26 17:34:04 +00:00
tools/randpkt-test.sh
CMake: Get rid of FULL_SO_VERSION gd2e0724afc moved our library versions into their own variables named FULL_SO_VERSION. They're no longer used and interfere with tools/release-update-debian-soversions.sh so remove them. Fix some shellcheck warnings in release-update-debian-soversions.sh while we're here. Bug: 14778 Change-Id: I0eb0bb4ab4c482bdb8a94f8c18aa04c6c83c781b Reviewed-on: https://code.wireshark.org/review/28068 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-06 19:01:44 +00:00
tools/release-update-debian-soversions.sh
Add an initial "shellcheck" target. Look for shellcheck in Autotools and CMake, and if found add a target that checks some of our shell scripts. Add a "source=" directive to targets that include test-common.sh so that shellcheck will correctly process the scripts. Note that this requires shellcheck 0.4.0 or later. To do: Fix the issues that shellcheck found and check more scripts. Change-Id: I441f9f59d8a3f8eec6718119c2370f2560b98f3c Reviewed-on: https://code.wireshark.org/review/17943 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-26 17:34:04 +00:00
tools/test-captures.sh
More shellcheck fixes. Change-Id: Iee9e464b3935d4c8a09fa9954f73496eae33f30f Reviewed-on: https://code.wireshark.org/review/28092 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-06-07 22:03:48 +00:00
tools/update-tx
Add an initial "shellcheck" target. Look for shellcheck in Autotools and CMake, and if found add a target that checks some of our shell scripts. Add a "source=" directive to targets that include test-common.sh so that shellcheck will correctly process the scripts. Note that this requires shellcheck 0.4.0 or later. To do: Fix the issues that shellcheck found and check more scripts. Change-Id: I441f9f59d8a3f8eec6718119c2370f2560b98f3c Reviewed-on: https://code.wireshark.org/review/17943 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-26 17:34:04 +00:00
tools/valgrind-wireshark.sh
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
)
endif()
cmake: add an "uninstall" target. Based on the uninstall target I added to libpcap and tcpdump's CMake files. cmake_uninstall.cmake.in is BSD-licensed, so I can use it here and in libpcap/tcpdump without adding any GPL stuff to libpcap/tcpdump.
2021-08-26 07:42:51 +00:00
# uninstall target
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY)
add_custom_target(uninstall
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
CMakeList.txt/Makefile.am (root) : fix indent (use tabs) Makefile.am: avoid double space CMakeList.txt: Add modelines info Change-Id: Ic27d16b2f502362509ab13158e5428208afe3925 Reviewed-on: https://code.wireshark.org/review/6570 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-15 11:45:02 +00:00
#
HTTPS (almost) everywhere. Change all wireshark.org URLs to use https. Fix some broken links while we're at it. Change-Id: I161bf8eeca43b8027605acea666032da86f5ea1c Reviewed-on: https://code.wireshark.org/review/34089 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-26 18:43:17 +00:00
# Editor modelines - https://www.wireshark.org/tools/modelines.html
CMakeList.txt/Makefile.am (root) : fix indent (use tabs) Makefile.am: avoid double space CMakeList.txt: Add modelines info Change-Id: Ic27d16b2f502362509ab13158e5428208afe3925 Reviewed-on: https://code.wireshark.org/review/6570 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-15 11:45:02 +00:00
#
# Local variables:
# c-basic-offset: 8
# tab-width: 8
# indent-tabs-mode: t
# End:
#
# vi: set shiftwidth=8 tabstop=8 noexpandtab:
# :indentSize=8:tabSize=8:noTabs=false:
#