From 1eb766b9d8720062fcd0a59ea540a63c2ef0e3c7 Mon Sep 17 00:00:00 2001 From: ctrlaltca Date: Wed, 18 Mar 2020 22:22:49 +0100 Subject: [PATCH] Fix dynamic loading of openssl libraries on windows (#3912) --- .appveyor.yml | 4 ++++ cmake/FindWin32SslRuntime.cmake | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index eef737b1..4963fe02 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -41,6 +41,10 @@ environment: vcpkg_arch: x86 install: + - cd C:\Tools\vcpkg + - git pull -q + - .\bootstrap-vcpkg.bat + - cd %APPVEYOR_BUILD_FOLDER% - vcpkg remove --outdated --recurse - vcpkg install openssl protobuf liblzma zlib --triplet %vcpkg_arch%-windows diff --git a/cmake/FindWin32SslRuntime.cmake b/cmake/FindWin32SslRuntime.cmake index 37ffd0b0..d1391142 100644 --- a/cmake/FindWin32SslRuntime.cmake +++ b/cmake/FindWin32SslRuntime.cmake @@ -52,8 +52,8 @@ set(_OPENSSL_ROOT_HINTS_AND_PATHS # For OpenSSL < 1.1, they are named libeay32 and ssleay32 and even if the dll is 64bit, it's still suffixed as *32.dll # For OpenSSL >= 1.1, they are named libcrypto and libssl with no suffix -FIND_FILE(WIN32SSLRUNTIME_LIBEAY NAMES libeay32.dll libcrypto.dll ${_OPENSSL_ROOT_HINTS_AND_PATHS}) -FIND_FILE(WIN32SSLRUNTIME_SSLEAY NAMES ssleay32.dll libssl.dll ${_OPENSSL_ROOT_HINTS_AND_PATHS}) +FIND_FILE(WIN32SSLRUNTIME_LIBEAY NAMES libcrypto-1_1.dll libcrypto.dll libeay32.dll ${_OPENSSL_ROOT_HINTS_AND_PATHS}) +FIND_FILE(WIN32SSLRUNTIME_SSLEAY NAMES libssl-1_1.dll libssl.dll ssleay32.dll ${_OPENSSL_ROOT_HINTS_AND_PATHS}) IF(WIN32SSLRUNTIME_LIBEAY AND WIN32SSLRUNTIME_SSLEAY)