aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2019-08-27cmake: check minimum zstd library version.Dario Lombardo1-1/+1
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-20Kafka: include zstd compression in Kafka message batchesPiotr Smolinski1-0/+11
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-16Windows: add nghttp2.pdb file to our PDB .zipPascal Quantin1-0/+1
Change-Id: I496959a04fdbd7a275d772600736bde63ac8b14e Reviewed-on: https://code.wireshark.org/review/34307 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-08-12cmake: allow VCSVERSION to be overridden with VCSVERSION_OVERRIDEPeter Wu1-8/+18
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-27HTTPS In More Places, update some URLs.Guy Harris1-8/+8
Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8 Reviewed-on: https://code.wireshark.org/review/34096 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-26HTTPS (almost) everywhere.Guy Harris1-1/+1
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-253.1.0 > 3.1.1.Gerald Combs1-1/+1
Change-Id: Idc7ab6cfe38cffa4053d0d8ce710cb95b33aa6ac Reviewed-on: https://code.wireshark.org/review/34084 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-07-21Remove ABI compliance checker code.João Valverde1-4/+0
It's broken, unmaintained, poorly implemented and obsoleted by saner debug-info methods. Note: To do the compliance check properly would require much more extensive work to clearly define public and private interfaces (without manual bookeeping of files or symbols either, of course, because who would want that...). Change-Id: Ib801f3c152ca2369f95ca1f4af4d37cd8cc7c47a Reviewed-on: https://code.wireshark.org/review/33928 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt>
2019-07-17Qt: Import Profile informationRoland Knall1-0/+18
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-03AppImage: Fix symbol name error in CMakeList.txtJaap Keuter1-1/+1
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-06-26tap: add credentials tap.Dario Lombardo1-0/+1
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-06-17CMakeList: We require minimum c++11Anders Broman1-0/+5
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-13sharkd: link with libm because of SpeexJaap Keuter1-0/+1
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-11Kill libwscodecs plugin library, just use pluginsJoão Valverde1-4/+0
Change-Id: I085d04840acb53b0b7681787429a2b4e10547cd5 Reviewed-on: https://code.wireshark.org/review/33068 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-11Move codec plugins to /pluginsJoão Valverde1-0/+17
Change-Id: I56d61e2ef737e4326080d75a2302c73a4075e8a1 Reviewed-on: https://code.wireshark.org/review/33067 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-05ship the dfilter_macros file.Dario Lombardo1-0/+1
By providing such a file, we give the users a basic toolbox of macros. At the moment 3 macros have been added, for private mac addresses, as well al IP v4 and v6. Change-Id: Icc33efce437adef00e268172c184c8b52167df23 Reviewed-on: https://code.wireshark.org/review/33449 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-05-24CMake+macOS: Use symlinks for our CLI utilities.Gerald Combs1-7/+13
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-16Enable -Wpointer-sign if we're enabling additional compiler warnings.Guy Harris1-1/+14
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-03CMake: Add libpcap imported library targetJoão Valverde1-2/+1
Change-Id: I5326b87784817fb353329e2d686fe0515c32f6cb Reviewed-on: https://code.wireshark.org/review/33038 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt>
2019-05-02CMake: Check for and use system SpeexDSP libraryJoão Valverde1-0/+23
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-05-01Windows: Modernize our WSAStartup usage.Gerald Combs1-4/+6
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-23CMake: add USE_STATIC optionFabrice Fontaine1-1/+5
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-22Add brotli decompression support for HTTP and HTTP2 dissectors.Dániel Bakai1-0/+11
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-20CMake: fix Windows build when all binaries are disabledPeter Wu1-14/+16
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-20CMake: silence -Wunsafe-loop-optimizations for GCC 7Peter Wu1-5/+10
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-19CMake: bail out if minimum GLib version is not satisfiedPeter Wu1-2/+1
Require glibconfig.h to be found and extract the version from this file, this has been present since the original GLib commit and is still present in the meson build system introduced with 2.53.4. Bug: 15706 Change-Id: I2e938a339d48d6815ed7cc46462735b93418377f Reviewed-on: https://code.wireshark.org/review/32894 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-04-09Windows: Use an lz4 DLL built with vcpkg.Gerald Combs1-0/+1
Update the Windows build environment to use lz4 packages built from a VS 2017 command prompt with set LZ4_VERSION=1.8.3 vcpkg remove lz4:x86-windows lz4:x64-windows vcpkg install lz4:x86-windows lz4:x64-windows vcpkg export lz4:x86-windows --output=lz4-%LZ4_VERSION%-win32ws --zip vcpkg export lz4:x64-windows --output=lz4-%LZ4_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: Icea512405d2085e5b271fa4a3ba8c0fe318b8cb5 Reviewed-on: https://code.wireshark.org/review/32785 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-04-03CMake: Require pod2man and pod2html.Gerald Combs1-1/+1
Require the POD package. Some platforms ship POD translators as a separate package instead of shipping them with Perl. Bug: 15513 Change-Id: Ie277f9296d06063581512bc4c2df1d3158117f2c Reviewed-on: https://code.wireshark.org/review/32685 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-03-18NSIS: Fix our extra installer location.Gerald Combs1-0/+2
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-18Windows: Start using a `vcpkg export` bundle.Gerald Combs1-31/+14
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-02-16Re-implement "Map" feature for EndpointsPeter Wu1-0/+1
This feature was removed in v2.5.1rc0-427-gf529ab5d0a, anticipating that MaxMind would remove support for it in 2019. They have however changed their mind and maintained latitude and longitude information. They recommend displaying an accuracy radius, but the reported values are 50, 100, 200 and 1000km. When implemented literally, a marker in Ireland would cover the whole island plus mainland, so I have instead opted to use a fixed radius of 1km at deeper zoom levels. The old ipmap.html file was outdated and had broken tiles, I rewrote a new one from scratch using the light-weight Leaflet library combined with tiles from OpenStreetMap. This is more mobile-friendly and secure (https, SRI). To improve handling of nearby or overlapping nodes, clustering is used (individual nodes can still be inspected). Browser compatibility results: IE8 is unusable, IE9 partially works (tooltips sometimes disappear and the cluster radius control is gone), IE11 works. Of course Firefox 65 and Chromium 72 have no issues. The map popup description in the generated GeoJSON structure is now split in several properties, allowing presentation to be handled by the HTML page instead of the C code. Bug: 14693 Change-Id: If2ec9c518f7723ac0ab27b6272463356875a0ff2 Reviewed-on: https://code.wireshark.org/review/31952 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-14Convert the FAQ to Asciidoctor and remove old help files.Gerald Combs1-55/+3
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-14CMake: Move the PLUGIN_PATH_ID definition.Gerald Combs1-17/+18
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-13macOS: Fix our plugin path.Gerald Combs1-19/+21
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-13CMake: disable relocatable builds when dumpcap is being builtPeter Wu1-1/+11
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-13Indicate what changes to make if we remove the version component.Guy Harris1-4/+10
Change-Id: I32fff5c34cfdb15a8102d2657e3380cf66928f66 Reviewed-on: https://code.wireshark.org/review/32002 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-02-13Fix directory containing compiled plugins in macOS.Guy Harris1-6/+11
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-12MacOS: Bundle and packaging updatesGerald Combs1-2/+5
Update the code signing portions of the packaging scripts to match newer versions of macOS. Change-Id: I5e03611d8db61416955e797edcadfcff1404cc38 Reviewed-on: https://code.wireshark.org/review/31996 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-11CMake: clear cache variables when a library has changedPeter Wu1-0/+45
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-10RPM: respect options for disabling Qt, SpanDSP and BCG729Peter Wu1-2/+2
"%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-07CMake: Make sure we deploy Qt PDBs on Windows.Gerald Combs1-0/+5
Pass "--pdb" to windeployqt 5.6 and later. Add a note about installing the "Qt Debug Information Files" component to the Developer's Guide. Change-Id: I81329bc9f9131050b1076fe275445b6325c24794 Reviewed-on: https://code.wireshark.org/review/31921 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-02-05CMake: Fix build without LibXml2Uli Heilmeier1-0/+8
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-052.9 → 3.1.Gerald Combs1-3/+3
Change-Id: Iea6b55037bfb62d2e9b333148cbdc55fcd53dfa2 Reviewed-on: https://code.wireshark.org/review/31888 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-04CMake: Update FindLibXml2.cmakeJoão Valverde1-6/+0
Change-Id: I55f77910be642535cba128900c2af40fa6824f04 Reviewed-on: https://code.wireshark.org/review/31874 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2019-02-03CMake: Install documentation to docdirJoão Valverde1-0/+1
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-02CMake: Fix DOCDIR on UnixJoão Valverde1-17/+19
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-01-31CMake: describe purpose of MaxMindDBPeter Wu1-0/+5
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-31CMake: describe the purpose of NLPeter Wu1-0/+5
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-31CMake: rewrite FindSystemd.cmake filePeter Wu1-0/+5
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-29CMake: Minor standard output improvementsJoão Valverde1-11/+14
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>