From 1f756114a58a9841919411915b49b0af5dfa7dbe Mon Sep 17 00:00:00 2001 From: Mike Gelfand Date: Tue, 18 Jun 2019 22:50:03 +0300 Subject: [PATCH] Support OpenSSL 1.1 x64 file names (MSI package) --- dist/msi/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dist/msi/CMakeLists.txt b/dist/msi/CMakeLists.txt index abbeaf806..76d84acd3 100644 --- a/dist/msi/CMakeLists.txt +++ b/dist/msi/CMakeLists.txt @@ -23,8 +23,12 @@ endif() find_msvc_crt_msm(TR_MSVC_CRT_MSM_FILE) if(OPENSSL_VERSION MATCHES "^1[.]1[.]") - set(TR_OPENSSL_CRYPTO_NAME "libcrypto-1_1.dll") - set(TR_OPENSSL_SSL_NAME "libssl-1_1.dll") + set(TR_OPENSSL_ARCH) + if(ARCH STREQUAL "x64") + set(TR_OPENSSL_ARCH "-x64") + endif() + set(TR_OPENSSL_CRYPTO_NAME "libcrypto-1_1${TR_OPENSSL_ARCH}.dll") + set(TR_OPENSSL_SSL_NAME "libssl-1_1${TR_OPENSSL_ARCH}.dll") else() set(TR_OPENSSL_CRYPTO_NAME "libeay32.dll") set(TR_OPENSSL_SSL_NAME "ssleay32.dll")