aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
AgeCommit message (Collapse)AuthorFilesLines
2019-01-23CMake: fix failure to locate zlib (and possibly libssh)Peter Wu1-1/+2
Include directories are no longer globally included, be explicit with the required include directories or else function checks will fail. Change-Id: I72d88f94854fcfe6529554f84e49d1dba696e9df Fixes: v2.9.1rc0-436-ga3991874eb ("CMake: Replace PACKAGELIST magic") Reviewed-on: https://code.wireshark.org/review/31693 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-19CMake: do not set an invalid INSTALL_RPATH for (plugin) librariesJoão Valverde1-0/+1
CMAKE_INSTALL_RPATH also applies to libraries such as plugins. This should not happen when relative RPATHs (through $ORIGIN) are in use, so fix that. Change-Id: I154d93ba6ed66c2f78a42b25e352b5b54e9b8818 Reviewed-on: https://code.wireshark.org/review/31609 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-18CMake: Fix Vcpkg x86 directory discovery.Gerald Combs1-1/+8
`vcpkg export` installs files into an architecture-dependent subdirectory which matches the PLATFORM environment variable on 64-bit Windows but not 32-bit Windows. Replace $ENV{PLATFORM} in FindWSWinLibs with a variable derived from WIRESHARK_TARGET_PLATFORM. Change-Id: I142615bd50179fdffdebd2bb1f193ef0070c0483 Reviewed-on: https://code.wireshark.org/review/31582 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>
2019-01-14Windows: Use a c-ares DLL built with vcpkg.Gerald Combs2-4/+14
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-13CMake: Don't go on about "custom files"João Valverde1-3/+1
For each call of add_custom_cmake_include() CMake prints STATUS "No custom file found in <full_path>". This is noisy, not to mention confusing. Print output only if a custom include is found, be silent otherwise. Change-Id: If603d206486354993ebac8e4c61f6876a26223d3 Reviewed-on: https://code.wireshark.org/review/31517 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-12CMake: Fix inconsistent find_package() report outputJoão Valverde9-9/+9
Most CMake find modules report the binary found, the modules fixed by this change represent an inconsistent exception. The first REQUIRED_VAR argument to find_package_handle_standard_args() is the one used by CMake to report on the result of find_package(). Compare (master) -- Found SNAPPY: /usr/include to (this change) -- Found SNAPPY: /usr/lib/x86_64-linux-gnu/libsnappy.so This convention of using XXX_LIBRARY matches upstream practice. Change-Id: Iaa0ec644e963430d73722354f6ee2a3694906ba7 Reviewed-on: https://code.wireshark.org/review/31498 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-10CMake: try harder to find the right Python versionPeter Wu1-1/+3
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-09CMake: remove LocatePythonExecutable.cmake for WindowsPeter Wu1-22/+0
Cygwin is now unsupported, so remove special handling for it and rely on FindPythonInterp.cmake to locate an appropriate version. This patch can only cause issues if the PATH environment variable contains the Cygwin binary directory without any native Python version appearing before that. In that case, either remove Cygwin from PATH or add the native Python (e.g. C:\Python37) earlier in PATH. Change-Id: Ia5554e5a83d06a941dacf4a28d41d84fca4fe99d Reviewed-on: https://code.wireshark.org/review/31453 Petri-Dish: Peter Wu <peter@lekensteyn.nl> 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-01-09CMake,WSDG: Remove Cygwin supportPeter Wu7-188/+11
Declare Cygwin as unsupported and remove all supporting code. Simplify some Chocolatey notes in the WSDG. Remove FindPerl.cmake as it only existed to force use of Wireshark's bundled FindCygwin.cmake (bug 13922). FindXSLTPROC.cmake special handling for Cygwin was also removed, in theory this could cause issues when the PATH contains a Cygwin xsltproc, but it's unsupported anyway. Change-Id: Iabfac2b4a9fd930530505d27bdba618bdb8f7f34 Reviewed-on: https://code.wireshark.org/review/31452 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-31CMake: clean up FindGNUTLS.cmakePeter Wu1-39/+27
Use consistent capitalization and whitespace. Remove library names from find_library that are unsuitable. No functional change intended. Change-Id: Ic40516542777d768b6eef656fe5c0a0af143fb7e Reviewed-on: https://code.wireshark.org/review/31264 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-31Windows: Upgrade GnuTLS to 1.6.3Peter Wu2-2/+6
Upgrade to GnuTLS 3.6.3-1, using MinGW binaries from Fedora 29 packages: mingw64-gnutls-3.6.3-1.fc29.noarch.rpm mingw64-gcc-8.2.0-3.fc29.x86_64.rpm mingw64-gmp-6.1.2-4.fc29.noarch.rpm mingw64-nettle-3.4-2.fc29.noarch.rpm mingw64-p11-kit-0.23.7-5.fc29.noarch.rpm mingw64-libffi-3.1-4.fc29.noarch.rpm mingw64-libtasn1-4.13-3.fc29.noarch.rpm mingw64-winpthreads-5.0.4-2.fc29.noarch.rpm This includes libgcc_s_seh-1.dll (64-bit, new) and libgcc_s_sjlj-1.dll (32-bit, previously included with glib2). Built with https://git.lekensteyn.nl/peter/wireshark-notes/tree/windows-libs/make-gnutls-libs-zip.sh?id=b86878e458d5d7deb21218ce6598b98af4ed7ec2 The main motivation is improved PKCS #11 support: - 3.6.0: fix potential compatibility issue with SafeNet HSMs https://gitlab.com/gnutls/gnutls/merge_requests/398/ - 3.6.2: gnutls_pkcs11_token_get_flags now forwards token info. - 3.6.3: new APIs for low-level PKCS #11 token or object operations. Change-Id: I235774e3b27f3426cb74d3d9c0ab593d06870e89 Reviewed-on: https://code.wireshark.org/review/31128 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-30CMake: clean up FindGCRYPT.cmakePeter Wu1-31/+32
Use consistent lowercase capitalization and whitespace. Windows: clarify libgpg-error names and remove libgcc_s (1.7.6/1.8.3 do not need it). Change-Id: I5d1b1a67f7a992ccfca4c28d0e19bbbfc41b7a4d Reviewed-on: https://code.wireshark.org/review/31244 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-29Windows: fix handling of Unicode paths in LuaPeter Wu1-1/+1
Lua internally uses ANSI C APIs (such as fopen). On many systems (macOS and Linux for example) these work fine with UTF-8. Windows however requires special Unicode APIs (such as _wfopen), so patch the Lua library to interpret paths are UTF-8 and call appropriate Unicode APIs. Changes compared to the previous LuaBinaries zip archive: - Patched with UTF-8 support for loadfile, os.execute, etc. - Built with VS 2015 (VCRUNTIME140.dll) instead of MinGW (MSVCRT.dll). - Includes PDB file for lua52.dll - Includes lua52.exe and luac52.exe with UTF-8 argv support (wmain). - Includes build scripts, source files and README.md. - Extra subdirectory named after the zip file. These zip files are taken from https://github.com/Lekensteyn/lua-unicode (the "prepared" source zips can be found here as well.) Bug: 15118 Change-Id: I219f046d6e0fd5093287b5d6503a48ba7d1fc6a4 Reviewed-on: https://code.wireshark.org/review/31165 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>
2018-11-30NSIS: Install NPcap instead of WinPcap.Gerald Combs1-1/+1
Install NPcap 0.99-r7 instead of WinPcap in the NSIS installer. Update and/or remove installer text, variables, and variable names accordingly. Change-Id: Ied36f00c2516127969894f55698e70401dfffb4f Reviewed-on: https://code.wireshark.org/review/30829 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-20Drop JSON-GLib completelyPeter Wu2-92/+2
JSON-GLib was added in v2.9.0rc0-201-g511c2e166a, but is no longer necessary since we have a home-grown JSON dumper (wsutil/json_dumper.h). Remove the remaining traces and additionally remove GObject from FindGLIB2.cmake since it was only added for JSON-GLib. Change-Id: If9dfd2c60cec130f98109d100bdb6618bde06ba0 Reviewed-on: https://code.wireshark.org/review/30733 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-07Require Python 3, drop Python 2 supportPeter Wu2-4/+7
Python 3 is widely available. All major Linux distributions support it. RHEL is covered via EPEL (which is already required for cmake3). Drop support for Python 2 in order to reduce maintenance costs. The main motivation is being able to simplify the tests. CMake is updated to search for Python >= 3.4 and will fail if unavailable (generating dissectors.c requires Python, so it is quite an important piece to have). The documentation is updated to reflect the Python 3.7 paths used by Chocolatey. Tested the git-review installation instructions in Windows 7 x64 without a previous Chocolatey installation. macOS brew now installs Python 3 (its dependencies are already installed by python@2 for libxml2). The macOS (non-brew variant) is updated to use the official 64-bit installer to install Python 3. Change-Id: I80b1e36957f338e0dad1bfcc173b6418682cddba Reviewed-on: https://code.wireshark.org/review/30192 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-06Windows: fix RC information generationPascal Quantin1-3/+3
Change-Id: I36e1da16b7eb8c224dab74750939a2c9a9a01cfa Reviewed-on: https://code.wireshark.org/review/30525 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-10-21lemon: sync with upstream (2018-09-08)Peter Wu1-1/+2
Changes: - Drop the old basename modification that was present in the Wireshark version of lemon.c. Use a new option available since 2018-04-20 ("Add the -dDIRECTORY command-line option to LEMON.") - Redo the static analyzer warning fixes, identifying the root causes and adding assertions instead of hiding code with __clang_analyzer__. - Ignore compiler warnings instead of adding config.h, _U_, extra const keywords, unsigned/signed changes, etc. - Remove lemon.html, it is out-of-date and external links are available. In order to make future updates easier, document the exact steps that were followed to create the lemon.c and lempar.c files. Future changes SHOULD follow the same process. My process to reach this updated lemon version: 1. Identify previous sync. Found v2.5.2rc0-147-g653af0f6d0 ("lemon: Sync with latest trunk.") which seems based on sqlite commit 2b3d584ffe. 2. Check successive Wireshark patches. Identified many non-functional changes to silence compiler warnings and static analyzer issues. Found one feature (basename) that can be replaced with upstream -d. 3. Write minimal patches and document changes. Upstream typos and coding style issues (other than trailing whitespace) were deliberately not fixed to remain as close as possible to upstream. Change-Id: I606f46dede86e34520f962a9e7163912392aad57 Reviewed-on: https://code.wireshark.org/review/30290 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-18FindM.cmake: directly pass -lm to fix selective static linkingPeter Wu1-2/+1
When CMAKE_FIND_LIBRARY_SUFFIXES is set to ".a" (in order to find only static libraries), executables would be linked with libm.a. This fails when the C runtime is not statically linked as well: https://bugzilla.redhat.com/show_bug.cgi?id=1433347 Change-Id: I1480607bd3d0678661694657a2709ee1c56f9530 Reviewed-on: https://code.wireshark.org/review/30253 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-18FindGLIB2.cmake: workaround to make static linking workPeter Wu1-0/+5
When using pkg_search_module(GLIB2 glib-2.0), it will also include transitive dependencies (pcre) in GLIB2_STATIC_LIBRARIES, but it will still lack -pthread (which is in GLIB2_STATIC_LDFLAGS). For simplicity just hardcode these. Change-Id: Ia227f8b56e088c71210a748aeb2dedaba521c090 Reviewed-on: https://code.wireshark.org/review/30252 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-18cmake: rewrite FindGMODULE2.cmake and FindGTHREAD2.cmakePeter Wu2-83/+65
These modules currently set the library variables from PkgConfig directly, but these are not absolute paths. These modules are therefore not usable for static linking. Rewrite these files to follow a more familiar pattern: collect hints, find absolute header/library paths and let FPHSA handle the REQUIRED check. The old modules had some special cases for Apple, but I believe that these cases are no longer relevant. Change-Id: Idaef7e35b40a3ab4449d92ccb12a9febde962cf6 Reviewed-on: https://code.wireshark.org/review/30251 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-16Revert "cmake: fix version check for c-ares and gnuTLS"Joakim Karlsson2-16/+1
This reverts commit 189a7357e799c0faa5e36d4966f485b9b6d394e3. Change-Id: I6550703036a135866d7751da489c4974be79bb37 Reviewed-on: https://code.wireshark.org/review/30226 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-15cmake: fix version check for c-ares and gnuTLSJoakim Karlsson2-1/+16
Version requirement was already in place but not executed Change-Id: I9a163fae2b428cecd309f932f5ef87dd8db8c516 Reviewed-on: https://code.wireshark.org/review/30210 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-14Windows: Remove Cygwin warningGraham Bloice1-2/+0
As Cygwin is no longer required for Windows, remove the CMake warning if it isn't found Change-Id: I2fd44a00941d6b3f33666d8f6fcfa44a40224ad9 Reviewed-on: https://code.wireshark.org/review/30194 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-10-10Windows: Make our program details more consistent.Gerald Combs1-0/+26
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-08Put the Windows-specific system library settings in CMakeLists.txt.Guy Harris1-16/+0
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-02We should only link executables with setargv.obj.Guy Harris1-3/+0
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-01Add a systemd Journal Export extcap.Gerald Combs1-0/+41
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-09CMake: Remove link test output lineJoão Valverde1-1/+0
The mode keyword STATUS needs to be capitalized, but this line is mostly redundant with the check_c_source_compiles_output(), so just remove it. Change-Id: I7f29915a7ab2c4b5681e0159773d9216643f8a9c Reviewed-on: https://code.wireshark.org/review/29524 Reviewed-by: João Valverde <j@v6e.pt>
2018-09-08CMake: Use upstream check compiler modules insteadJoão Valverde2-117/+0
CMake gives precedence to modules in CMAKE_MODULES_PATH (ours then). It already includes CheckCCompilerFlags and CheckCXXCompilerFlags, prefer uptream's instead, to benefit from bug fixes, etc. Change-Id: I063c43cf29f5837c445e8281262356660594c4e5 Reviewed-on: https://code.wireshark.org/review/29484 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-07cmake: optionally require Lua 5.1 or newerPeter Wu1-4/+2
doc/README.wslua reports support for 5.1 and 5.2 only. Even RHEL6 ships with Lua 5.1, so it makes not sense to maintain support for Lua 5.0. Change-Id: I34a8084c7fba19d631b90ce5d5a28198be6a7850 Reviewed-on: https://code.wireshark.org/review/29448 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-25CMake: Modernize config-file package supportJoão Valverde3-61/+0
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-23CMake: Clean up and homogenize plugin dir configurationJoão Valverde2-4/+5
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-22Revert "CMake: Clean up plugin dirs"João Valverde1-2/+1
Broke system (global) binary plugin path. This reverts commit 450ff674a6e84c3abebff76a470d72114083f27f. Change-Id: I5353d2f3acf4450aed243040ef71425a71542a08 Reviewed-on: https://code.wireshark.org/review/29240 Reviewed-by: João Valverde <j@v6e.pt>
2018-08-21CMake: Clean up plugin dirsJoão Valverde1-1/+2
Change-Id: Ie41366205db19b8a9714ad5259c3f958e1e9ee95 Reviewed-on: https://code.wireshark.org/review/29233 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-07-20Clean up tests.Guy Harris1-91/+102
On Windows with MSVC, just assume we have 64-bit file offset support, including _fseeki64() and _ftelli64(). On UN*X, test for Large File Support and for fseeko()/ftello(), and for what #defines are needed to enable them. On Windows without MSVC, test for Large File Support, but assume we have _fseeki64() and _ftelli64(); what *should* we be doing? Clean up indentation and else()/endif() arguments while we're at it. Change-Id: I801d1f4059abbed2d5123d2375a560634a9ee056 Reviewed-on: https://code.wireshark.org/review/28781 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-07-20CMake: Don't bother testing for _fseeki64 on Windows.Gerald Combs2-28/+4
We don't appear to use it and if we ever do need it it's been available since Visual Studio 2005 / MSVCR80. Change-Id: Ifd44d78b96a21577ceea635653517a348ded50f7 Reviewed-on: https://code.wireshark.org/review/28778 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-07-16Lua: add include/lua-5.1 and include/lua-5.2 to CMake path suffixesPascal Quantin1-1/+1
Bug: 14983 Change-Id: I8be206ace7f61c62e2e42bc53841067ec39e3a0a Reviewed-on: https://code.wireshark.org/review/28726 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-06-27docbook: reduce ruby code duplication by introducing utils module.Dario Lombardo1-0/+1
Change-Id: I7e436db3cb86f5ebd0f5827c6da630303bc3f538 Reviewed-on: https://code.wireshark.org/review/28400 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-21Fix build paths for cmake's Xcode project generator on macOS.David Kreitschmann1-9/+0
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-11Rewrite make-{dissectors,taps} in PythonJoão Valverde1-2/+2
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-05-24Asciidoctor: Remove underscores from macro names.Gerald Combs1-3/+3
AsciiDoc allows dashes in macro names but not underscores. Current versions of AsciiDoctor allow the inverse. Remove underscores to allow for easier copying and pasting. Remove asciidoc.conf while we're here. It's no longer used. Change-Id: I32d8a4ec695b9e17a80ac720ee9faf62dbb362d3 Reviewed-on: https://code.wireshark.org/review/27787 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-23Don't look for Asciidoctor PDF unless we find Asciidoctor.Gerald Combs1-12/+12
Fix a doc string while we're here. Change-Id: Ic67e40dc7e8d624a00b97fe40fe162e6f8633cfc Reviewed-on: https://code.wireshark.org/review/27728 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-22CMake: Search for asciidoctor-pdf separate from asciidoctor.Gerald Combs2-101/+46
Search for asciidoctorj and asciidoctor-pdf and set ASCIIDOCTOR_PDF_EXECUTABLE if either are found. Only enable the PDF targets if we find ASCIIDOCTOR_PDF_EXECUTABLE. Remove env.cmake since it's no longer needed. Change-Id: Iee82b30eaa67d1ad3fd3a296d9997b0643a0cb4e Reviewed-on: https://code.wireshark.org/review/27696 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-11CMake: Remove FindFreetype.Gerald Combs1-129/+0
Remove the FindFreetype module. It was required by the FindGTK2 module, but it's no longer used. Change-Id: Id7575d024b5c13b5800989434a994e3a0dcb2b26 Reviewed-on: https://code.wireshark.org/review/27450 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-02Test: Remove the Bash test scripts.Gerald Combs1-41/+0
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-04-25Put references to autotools in the past tense.Guy Harris1-1/+1
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-24cmake: remove warnings -Werror=old-style-definitionJoakim Karlsson3-3/+3
see https://cmake.org/Bug/bug_relationship_graph.php?bug_id=15058 Change-Id: I325f476b145a542e987a13bedd1f95a7d8faba94 Reviewed-on: https://code.wireshark.org/review/27121 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-24cmake: remove gtk find scripts.Dario Lombardo2-1116/+0
Change-Id: I1645b664ddbf879e82bd4759d26993eab9f2490e Reviewed-on: https://code.wireshark.org/review/27115 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-24CMake: Doxygen and API reference target updates.Gerald Combs1-5/+11
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 02:08:01 +0000