]> granicus.if.org Git - transmission/commitdiff
Support OpenSSL 1.1 x64 file names (MSI package)
authorMike Gelfand <mikedld@mikedld.com>
Tue, 18 Jun 2019 19:50:03 +0000 (22:50 +0300)
committerMike Gelfand <mikedld@mikedld.com>
Tue, 18 Jun 2019 19:50:03 +0000 (22:50 +0300)
dist/msi/CMakeLists.txt

index abbeaf806f5c53ee967060fc026ff3ded7f081cc..76d84acd3f864091866c090cd028f4b6a0649b1f 100644 (file)
@@ -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")