aboutsummaryrefslogtreecommitdiffstats
path: root/cmake/modules/FindGNUTLS.cmake
AgeCommit message (Collapse)AuthorFilesLines
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 Wu1-1/+2
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-10-16Revert "cmake: fix version check for c-ares and gnuTLS"Joakim Karlsson1-6/+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 Karlsson1-1/+6
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>
2017-11-18CMake: Clean up Windows buildGraham Bloice1-2/+4
Remove options that aren't supported on Windows Don't use pkgconfig on Windows Change-Id: I79718a1c43f56a9ec88f690490931b80b727dd68 Reviewed-on: https://code.wireshark.org/review/24481 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>
2017-02-17CMake: Move the search for libgcc_s to GLib.Gerald Combs1-1/+1
Move the search for the libgcc_s_seh and _sjlj DLLs to the GLib directory. That's the only place it currently exists on the 64-bit builder. Change-Id: Icf55dacf061d9423e78cabeaf16aa539ccb619bb Reviewed-on: https://code.wireshark.org/review/20162 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-15Windows: update GnuTLS to 3.4.11 and Libgcrypt to 1.7.6Pascal Quantin1-2/+8
Also switch some third party libraries to stripped version to reduce size Change-Id: If0fd06a85fb17fb3e35543bcc714c8a8a1ce20c6 Reviewed-on: https://code.wireshark.org/review/20117 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-25Require GnuTLS 2.12.0, add cmake version detectionPeter Wu1-3/+16
Since v2.1.0rc0-17-g877fd03 and v2.0.0rc0-23-g263ff53 ("ssl-utils: load RSA keys based on their modulus+exponent"), GnuTLS 2.12.0 is needed. Add a version check to cmake as well, tested on CentOS6 (with pkg-config check disabled to verify the code path). Note that RHEL6 has GnuTLS 2.8.5 and thus SSL decryption with a RSA private key is no longer supported on that version. Change-Id: I99fdfe6790107f48629dd435794fe8880263063d Reviewed-on: https://code.wireshark.org/review/11044 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: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-01-13CMake: Copy libwireshark dependent DLLs to the target directory.Gerald Combs1-0/+24
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>
2014-10-01cmake: use pkg-config for resolving dependenciesPeter Wu1-9/+21
Changes: * Fix glib2 search path. * Add pkg-config support to CAP, GEOIP, GNUTLS, LUA, PortAudio (API 19), zlib, kerberos. * Add pkg-config support to libnl3, libnl2 and libnl1 (but tested only with libnl3). This makes it easier to do 32-bit builds on 64-bit hosts by just setting `PKG_CONFIG_LIBDIR`. Due to how HINTS work, it is still fragile though: missing 32-bit libraries will cause a fallback to 64-bit libraries. A future patch could check for `<PREFIX>_FOUND` and remove the manual `find_path` and `find_library` hackery since the paths are already known. Change-Id: Ieb4fb74695c96afb1a4c70168e84abb1fa4612c6 Reviewed-on: https://code.wireshark.org/review/4292 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-06Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0Pascal Quantin1-2/+2
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4 Reviewed-on: https://code.wireshark.org/review/1978 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2013-10-04Fix a typoJörg Mayer1-2/+2
svn path=/trunk/; revision=52351
2013-10-04Fogot to set the <package>_INCLUDE_DIRS variable, thus itJörg Mayer1-2/+6
would only work on platforms where the required path got set for another package svn path=/trunk/; revision=52350
2013-09-23Beginnings of win cmake support (not yet working), created by Graham Bloice,Jörg Mayer1-2/+6
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
2009-09-23- Add $Id: $ tagsJörg Mayer1-0/+3
- FindHtmlViewer.cmake: Try to add reading the name of the html viewer from the HTML_VIEWER environment variable (untested) svn path=/trunk/; revision=30104
2009-09-09CMAKE: Get most of of missing *build* pieces into placeJörg Mayer1-0/+35
svn path=/trunk/; revision=29819
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 08:15:08 +0000