Support OpenSSL 1.1 file names (MSI package)

diff --git a/dist/msi/CMakeLists.txt b/dist/msi/CMakeLists.txt
index 991b46b7ea6e07277182688cf084dca3e91ad0d0..abbeaf806f5c53ee967060fc026ff3ded7f081cc 100644 (file)
--- a/dist/msi/CMakeLists.txt
+++ b/dist/msi/CMakeLists.txt
@@ -22,6 +22,14 @@ 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")
+else()
+    set(TR_OPENSSL_CRYPTO_NAME "libeay32.dll")
+    set(TR_OPENSSL_SSL_NAME "ssleay32.dll")
+endif()
+
 set(ICONS_DIR "${CMAKE_SOURCE_DIR}/qt/icons/hicolor")
 png2ico(Transmission.ico
     "${ICONS_DIR}/16x16/transmission-qt.png"
@@ -70,6 +78,8 @@ wix_candle(${PROJECT_NAME}_OBJS
         "TrQmSrcDir=${TRQMSRCDIR}"
         "QtQmSrcDir=${QTQMSRCDIR}"
         "MsvcCrtMsmFile=${TR_MSVC_CRT_MSM_FILE}"
+        "OpenSslCryptoName=${TR_OPENSSL_CRYPTO_NAME}"
+        "OpenSslSslName=${TR_OPENSSL_SSL_NAME}"
     EXTRA_DEPENDS
         "${CMAKE_CURRENT_BINARY_DIR}/TransmissionConfig.wxi")
 

diff --git a/dist/msi/components/CommonLibs.wxs b/dist/msi/components/CommonLibs.wxs
index 2be30e4d0f6321536a6ebcd2e0baa72564f27a97..fa84c8b9923f10ac1dc103adf9619cec1ec53119 100644 (file)
--- a/dist/msi/components/CommonLibs.wxs
+++ b/dist/msi/components/CommonLibs.wxs
@@ -9,10 +9,10 @@
         <File DiskId="1" KeyPath="yes" Name="libcurl.dll" />
       </Component>
       <Component Id="dll.openssl.crypto">
-        <File DiskId="1" KeyPath="yes" Name="libeay32.dll" />
+        <File DiskId="1" KeyPath="yes" Name="$(var.OpenSslCryptoName)" />
       </Component>
       <Component Id="dll.openssl.ssl">
-        <File DiskId="1" KeyPath="yes" Name="ssleay32.dll" />
+        <File DiskId="1" KeyPath="yes" Name="$(var.OpenSslSslName)" />
       </Component>
       <Component Id="dll.zlib">
         <File DiskId="1" KeyPath="yes" Name="zlib.dll" />