diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2017-02-15 14:01:23 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2017-02-15 17:32:36 +0000 |
| commit | 0b8a12fd51c3d9fde677b42bc37db49e61669abd (patch) | |
| tree | 7ffcc55b5a7eb952678d2c659e78ec9b33b09b0b /cmake | |
| parent | a691315652b3bc805d9d358fad60ac975ea9f051 (diff) | |
| download | wireshark-0b8a12fd51c3d9fde677b42bc37db49e61669abd.tar.gz | |
Windows: update GnuTLS to 3.4.11 and Libgcrypt to 1.7.6
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>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindGCRYPT.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/FindGNUTLS.cmake | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/cmake/modules/FindGCRYPT.cmake b/cmake/modules/FindGCRYPT.cmake index 8c0a367033..6b6f2dcc3a 100644 --- a/cmake/modules/FindGCRYPT.cmake +++ b/cmake/modules/FindGCRYPT.cmake @@ -15,7 +15,7 @@ IF (GCRYPT_INCLUDE_DIRS) ENDIF (GCRYPT_INCLUDE_DIRS) INCLUDE(FindWSWinLibs) -FindWSWinLibs("gnutls-.*" "GCRYPT_HINTS") +FindWSWinLibs("libgcrypt-.*" "GCRYPT_HINTS") FIND_PATH(GCRYPT_INCLUDE_DIR gcrypt.h HINTS diff --git a/cmake/modules/FindGNUTLS.cmake b/cmake/modules/FindGNUTLS.cmake index c10efee59b..dd1042ae37 100644 --- a/cmake/modules/FindGNUTLS.cmake +++ b/cmake/modules/FindGNUTLS.cmake @@ -31,12 +31,17 @@ FIND_PATH(GNUTLS_INCLUDE_DIR "${GNUTLS_HINTS}" ) -SET(GNUTLS_NAMES gnutls libgnutls-28) +SET(GNUTLS_NAMES gnutls libgnutls-28 libgnutls-30) +SET(HOGWEED_NAMES libhogweed-2-4 libhogweed-4-2) +SET(NETTLE_NAMES libnettle-4-6 libnettle-6-2) FIND_LIBRARY(GNUTLS_LIBRARY NAMES ${GNUTLS_NAMES} - libgmp-10 libgcc_s_sjlj-1 libffi-6 libhogweed-2-4 libnettle-4-6 + ${HOGWEED_NAMES} + ${NETTLE_NAMES} + libgmp-10 libgcc_s_sjlj-1 libffi-6 libp11-kit-0 libtasn1-6 + libwinpthread-1 HINTS "${GNUTLS_LIBDIR}" "${GNUTLS_HINTS}/bin" @@ -76,6 +81,7 @@ IF(GNUTLS_FOUND) "${GNUTLS_DLL_DIR}/libnettle-*.dll" "${GNUTLS_DLL_DIR}/libp11-kit-*.dll" "${GNUTLS_DLL_DIR}/libtasn1-*.dll" + "${GNUTLS_DLL_DIR}/libwinpthread-*.dll" ) set ( GNUTLS_DLLS ${_gnutls_dlls} # We're storing filenames only. Should we use STRING instead? |