diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-04 19:17:44 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-06 15:33:01 +0000 |
| commit | ad7b5381ac54567217f12ee729c7be6cd2848d0f (patch) | |
| tree | 657b9b157455eb8d55713ea7d8df20c583b492fd /cmake | |
| parent | 97f0fb0e5386ae4bfd759311d03727598556955c (diff) | |
Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4
Reviewed-on: https://code.wireshark.org/review/1978
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindGCRYPT.cmake | 4 | ||||
| -rw-r--r-- | cmake/modules/FindGNUTLS.cmake | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmake/modules/FindGCRYPT.cmake b/cmake/modules/FindGCRYPT.cmake index 638ddfedba..5615e8830f 100644 --- a/cmake/modules/FindGCRYPT.cmake +++ b/cmake/modules/FindGCRYPT.cmake @@ -22,8 +22,8 @@ FIND_PATH(GCRYPT_INCLUDE_DIR gcrypt.h include ) -SET(GCRYPT_NAMES gcrypt libgcrypt-11) -FIND_LIBRARY(GCRYPT_LIBRARY NAMES ${GCRYPT_NAMES} HINTS "${GCRYPT_HINTS}/bin") +SET(GCRYPT_NAMES gcrypt libgcrypt-20) +FIND_LIBRARY(GCRYPT_LIBRARY NAMES ${GCRYPT_NAMES} libgcc_s_sjlj-1 HINTS "${GCRYPT_HINTS}/bin") FIND_LIBRARY(GCRYPT_ERROR_LIBRARY NAMES gpg-error libgpg-error-0 HINTS "${GCRYPT_HINTS}/bin") # handle the QUIETLY and REQUIRED arguments and set GCRYPT_FOUND to TRUE if diff --git a/cmake/modules/FindGNUTLS.cmake b/cmake/modules/FindGNUTLS.cmake index 8a21922d21..f06835fc44 100644 --- a/cmake/modules/FindGNUTLS.cmake +++ b/cmake/modules/FindGNUTLS.cmake @@ -25,8 +25,8 @@ FIND_PATH(GNUTLS_INCLUDE_DIR ${GNUTLS_HINTS} ) -SET(GNUTLS_NAMES gnutls libgnutls-26) -FIND_LIBRARY(GNUTLS_LIBRARY NAMES ${GNUTLS_NAMES} HINTS "${GNUTLS_HINTS}/bin" ) +SET(GNUTLS_NAMES gnutls libgnutls-28) +FIND_LIBRARY(GNUTLS_LIBRARY NAMES ${GNUTLS_NAMES} libgmp-10 libgcc_s_sjlj-1 libffi-6 libhogweed-2-4 libnettle-4-6 libp11-kit-0 libtasn1-6 HINTS "${GNUTLS_HINTS}/bin" ) # handle the QUIETLY and REQUIRED arguments and set GNUTLS_FOUND to TRUE if # all listed variables are TRUE |