Commit 574f44b4 authored by Xavier Claessens's avatar Xavier Claessens Committed by Olivier Crête

Fix error when crypto/ssl libs are found without pkg-config

In that case crypto_dep is a list and we can't call .found() method.
parent bddeefdf
...@@ -209,7 +209,8 @@ else ...@@ -209,7 +209,8 @@ else
endif endif
endif endif
if not crypto_dep.found() and opt_cryptolib != 'gnutls' crypto_found = crypto_dep.found()
if not crypto_found and opt_cryptolib != 'gnutls'
# MSVC builds of OpenSSL does not generate pkg-config files, # MSVC builds of OpenSSL does not generate pkg-config files,
# so we check for it manually here in this case, if we can't find those files # so we check for it manually here in this case, if we can't find those files
# Based on the CMake check for OpenSSL in CURL's CMakeLists.txt, # Based on the CMake check for OpenSSL in CURL's CMakeLists.txt,
...@@ -239,10 +240,11 @@ if not crypto_dep.found() and opt_cryptolib != 'gnutls' ...@@ -239,10 +240,11 @@ if not crypto_dep.found() and opt_cryptolib != 'gnutls'
if libcrypto_dep.found() and libssl_dep.found() if libcrypto_dep.found() and libssl_dep.found()
crypto_dep = [libcrypto_dep, libssl_dep] crypto_dep = [libcrypto_dep, libssl_dep]
crypto_found = true
endif endif
endif endif
if not crypto_dep.found() if not crypto_found
if opt_cryptolib == 'gnutls' if opt_cryptolib == 'gnutls'
error('GnuTLS requested as crypto library, but not found') error('GnuTLS requested as crypto library, but not found')
elif opt_cryptolib == 'openssl' elif opt_cryptolib == 'openssl'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment