aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
AgeCommit message (Collapse)AuthorFilesLines
2022-10-10Windows: Fix detection of asciidoctor againJoão Valverde1-0/+3
Scoop uses "asciidoctorj.cmd". The others were added for completeness.
2022-08-19Windows: Upgrade libgcrypt to 1.10.1.Gerald Combs1-4/+7
2022-08-15Falco Bridge: Update to match falcosecurity-libs 0.8.0.Gerald Combs2-106/+138
Update sinsp-span to use the current Falco libs APIs. Update the FindSinsp CMake module to use pkg-config.
2022-07-29Docs: Fix our man page dependencies.Gerald Combs1-0/+10
Dependencies need to be set via add_custom_command.
2022-07-26Add vcpkg-export-20220726-1.Gerald Combs1-1/+1
Add vcpkg-export-20220726-1, which includes Dirent 1.23.2 Gettext 0.21 GLib2 2.72.3 Libffi 3.4 Libiconv 1.17 Liblzma 5.2.5 Libxml2 2.9.14 PCRE 8.45 Zlib 1.2.12 Ping #16265.
2022-07-25CMake: improve finding C-Ares libraryJoakim Karlsson1-3/+16
2022-07-06Rename Logwolf to LograyGerald Combs1-2/+2
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-04-27Falco Bridge: Fix building on Windows.Gerald Combs1-8/+20
Fix Falco plugin installation in multi-config environments. Fix FindSinsp on Windows. Ignore a couple of warnings for now.
2022-04-25CMake+Logwolf: Populate our Falco plugin directory.Gerald Combs1-7/+20
Create plugins/<version>/falco and copy over the Cloudtrail plugin.
2022-04-21macOS: Require Sparkle 2.Gerald Combs1-2/+4
Remove our Sparkle 1 code. Fixes #18035.
2022-04-18macOS: Add support for Sparkle 2.Gerald Combs1-10/+9
Sparkle 2 deprecated the sharedUpdater singleton, so create our own which uses Sparkle 2's updated API. Ping #18035. Update our CMake version check.
2022-04-04CMake: Finish splitting ADD_PLUGIN_LIBRARY.Gerald Combs1-2/+7
Rename add_plugin_library to add_wireshark_plugin_library and add a backward compatibility wrapper. Make Falco Bridge a Logwolf plugin.
2022-04-04CMake: Add a jsoncpp include path.Gerald Combs1-0/+1
Ubunutu (and presumably Debian) install jsoncpp's include files in /usr/include/jsoncpp/json.
2022-04-04More Logshark to Logwolf renaming.Gerald Combs1-0/+8
2022-03-22CMake+Sysdig Bridge: Add a FindSinsp module.Gerald Combs1-0/+128
Add a FindSinsp CMake module, and use it in the Sysdig Bridge plugin CMakeLists.txt. It still needs work, but should at least be usable on more machines. Conflicts: plugins/epan/sysdig_bridge/CMakeLists.txt
2022-03-09Rename the "image" directory to "resources".Gerald Combs1-3/+3
The "image" directory contains resource compiler assets and other application resources, so name it "resources."
2022-01-13macOS: Require Sparkle 1 for now.Gerald Combs1-1/+20
The Sparkle project recently released Sparkle 2.0.0, which deprecates the version 1 API. Add version discovery to FindSparkle.cmake and require version 1 until we add support for the new API. Ping #17861.
2021-12-22CMake: Update our WiX search paths.Gerald Combs1-9/+9
2021-12-22Corrects repeated words throughout the code.Moshe Kaplan1-2/+2
Repeated words were found with: egrep "(\b[a-zA-Z]+) +\1\b" . -Ir and then manually reviewed. Non-displayed strings (e.g., in comments) were also corrected, to ease future review.
2021-12-11CMake+GitLab CI: Reduce verbosity.Gerald Combs2-1/+2
For various commands, make sure we show warnings and errors, but not other extraneous information such as filenames.
2021-11-14dfilter: Add support for PCRE2João Valverde1-0/+70
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-11-07MSYS2/CMake: Fix asciidoctor invocationJoão Valverde1-0/+1
CMake does not use any shell to run execute_process(). When running asciidoctor we must use the batch file. Put that before "asciidoctor" (a ruby script) so CMake uses that instead.
2021-10-21CMake: Place all of the documentation in the "Documentation" folder.Gerald Combs1-1/+1
2021-10-20CMake+Docs: Update our man page targets.Gerald Combs1-10/+0
Remove the generate_*_pages targets that were recently introduced, since they're not really needed. Only add the "manpages" target if we have Asciidoctor.
2021-10-19CMake+Docs: Generate man pages all at once.Gerald Combs2-11/+53
Asciidoctor lets us generate multiple documents at once, so do so for our man pages. If we're using AsciidoctorJ this minimizes the number of JVM instances we have to spin up. This reduces the build time on my Windows VM here quite a bit, and will hopefully do so on the CI builders. Add a .editorconfig file in cmake/modules.
2021-10-13CMake: Try to make our man page builds faster.Gerald Combs1-4/+10
Depend on our generator targets instead of the generated files, which allows parallel builds outside of Ninja. Don't reserve JRE memory when building HTML and man page targets. This reduces the "docs" target build time on my Windows VM here from over two minutes to under one.
2021-10-01Docs+Packaging: Convert our man pages to Asciidoctor.Gerald Combs2-90/+29
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-09-27Windows: Add preliminary support for MSYS2João Valverde1-3/+4
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-23Add compatibility fix for Minizip dependencyJoão Valverde1-0/+7
2021-09-23Docs: Asciidoctor.js isn't yet suitable for our needs.Gerald Combs1-4/+2
Reverse the text added in cdd6f2ec80 and note that we can't yet use Asciidoctor.js to build our documentation. I'm not sure how I managed to miss this in my initial tests, but Asciidoctor.js is missing Docbook, PDF, and EPUB backends, and doesn't support Ruby macros.
2021-09-20CMake: Add Doxygen search hint for WindowsJoão Valverde1-0/+1
This is where chocolatey installs doxygen. > choco install doxygen.install
2021-09-18epan: Remove some extraneous #ifdefsJoão Valverde1-0/+2
If a macro identifier is not defined it evaluates to zero in an expression, so the outer #ifdef is unnecessary and should be avoided (the less the better). Add a missing CMake comment while here.
2021-08-31cmake: lemon: fix path to internal lemon toolAdrian Ratiu1-1/+1
Wireshark fails to build when cross-compiling on Gentoo/ChromeOS systems because the lemon command is not properly specified or included in PATH, failing with: /bin/sh: lemon: command not found The relevant excerpt from build.ninja is: COMMAND = cd ..._build/plugins/epan/mate && lemon -T.../tools/lemon/lempar.c -d. .../plugins/epan/mate/mate_grammar.lemon By specifying the full path to "lemon" we ensure it is always searched and found in the correct location.
2021-08-29Cmake: misplaced quote in epub asciidoctor_optsChuck Craft1-1/+1
Follow up to !3988
2021-08-27CMake: Use "'" instead of "’" in our guide filenames.Gerald Combs1-6/+7
Use an apostrophe instead of RIGHT SINGLE QUOTATION MARK in our PDF and EPUB filenames. Some programs (notably Okular) can't open filenames with extended characters, at least on Windows.
2021-08-10CMake: include CheckFunctionExists in FindKERBEROS.cmakePascal Quantin1-0/+1
2021-08-03Docs: Give the PDF and EPUB guides descriptive filenames.Gerald Combs1-9/+14
Use the document title for our PDF and EPUB filenames under the theory that "Wireshark User’s Guide.pdf" is more obvious than "user-guide.pdf".
2021-07-30Docs: Add epub targets for the guides.Gerald Combs1-0/+47
Add user_guide_epub and developer_guide_epub targets that generate EPUB versions of the User's Guide and Developer's Guide. Ping #17494.
2021-07-23CMake: Remove some unused definitionsJoão Valverde1-1/+1
2021-07-15packet-kerberos: implement PAC Ticket checksum verificationStefan Metzmacher1-0/+2
We use some private functions from MIT kerberos: - krb5_free_enc_tkt_part() - decode_krb5_enc_tkt_part() - encode_krb5_enc_tkt_part() but we already do that for krb5int_c_mandatory_cksumtype(), which is newer than the above functions. We use all of them only under HAVE_KRB5_PAC_VERIFY, so we don't seem to need additional configure tests. Signed-off-by: Stefan Metzmacher <metze@samba.org>
2021-07-14CMake: Fixup SpanDSP's TIFF includes.Gerald Combs1-0/+6
Add TIFF_INCLUDE_DIR to SPANDSP_INCLUDE_DIRS, but only if TIFF has been found. Ping #17477.
2021-06-23CMake+docs: Use Asciidoctor.js if it's available.Gerald Combs1-0/+4
Add the executables shipped by the Asciidoctor.js project to FindAsciidoctor.cmake, and update the Developer's Guide to match.
2021-06-22CMake: Mark our plugin include directories PRIVATE.Gerald Combs1-0/+2
Use target_include_directories to mark our local include directories PRIVATE, similar to what we do elsewhere.
2021-06-11CMake: Fixup our glibconfig.h discovery.Gerald Combs1-7/+10
On Windows, search for glibconfig.h in the vcpkg lib directory. Search for it in the directory that contains libglib-2.0 on other platforms. Avoid a side effect that caused us to search in `/lib` on non-Windows platforms. Don't add GLIB2_LIBRARY to the search path -- that contains the path to a file, not a directory.
2021-06-10Windows: Update GLib to 2.66.4.Gerald Combs3-37/+41
Upgrade our vcpkg bundle to one that includes GLib 2.66.4 and libxml2 2.9.10. Avoid running pkgconfig on Windows so that we don't find Strawberry Perl's headers.
2021-06-04Windows: Switch from HTML Help to plain HTML.Gerald Combs3-125/+0
Switch from HTML Help to plain HTML files. In the NSIS and WiX installers, place the help assets in a directory with a friendly name.
2021-05-25epan: Add SMI versionJoão Valverde1-0/+8
2021-04-10CMake: Add ENABLE_VLD option for MSVCTomasz Moń2-0/+65
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-29Merge the caputils/ and capchild/ directoriesJoão Valverde1-1/+1
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-22Replace the Large File Support CMake stuff.Guy Harris5-198/+238
The existing stuff doesn't appear to work (I tried it on 32-bit Ubuntu 18.04, and it did *not* add any flags to the compilation, as it appeared not to conclude that they were necessary, even though they were). Pull in the stuff from libpcap, which *does* appear to work. (it does so in my 32-bit Ubuntu testing). This should fix #17301. While we're at it, fix cppcheck.sh so that it doesn't attempt to run cppcheck on files that have been deleted.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 14:13:57 +0000