mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-01-03 05:25:52 +00:00
Code Issues Releases Wiki Activity

Support OpenSSL 1.1 file names (MSI package)

Browse source
This commit is contained in:
Mike Gelfand 2019-06-18 08:10:01 +03:00
parent a82c26642c
commit af3d4639e2
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dist/msi/CMakeLists.txt vendored
View file

@ -22,6 +22,14 @@ endif()
find_msvc_crt_msm(TR_MSVC_CRT_MSM_FILE) 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") set(ICONS_DIR "${CMAKE_SOURCE_DIR}/qt/icons/hicolor")
png2ico(Transmission.ico png2ico(Transmission.ico
"${ICONS_DIR}/16x16/transmission-qt.png" "${ICONS_DIR}/16x16/transmission-qt.png"
@ -70,6 +78,8 @@ wix_candle(${PROJECT_NAME}_OBJS
"TrQmSrcDir=${TRQMSRCDIR}" "TrQmSrcDir=${TRQMSRCDIR}"
"QtQmSrcDir=${QTQMSRCDIR}" "QtQmSrcDir=${QTQMSRCDIR}"
"MsvcCrtMsmFile=${TR_MSVC_CRT_MSM_FILE}" "MsvcCrtMsmFile=${TR_MSVC_CRT_MSM_FILE}"
"OpenSslCryptoName=${TR_OPENSSL_CRYPTO_NAME}"
"OpenSslSslName=${TR_OPENSSL_SSL_NAME}"
EXTRA_DEPENDS EXTRA_DEPENDS
"${CMAKE_CURRENT_BINARY_DIR}/TransmissionConfig.wxi") "${CMAKE_CURRENT_BINARY_DIR}/TransmissionConfig.wxi")

4
dist/msi/components/CommonLibs.wxs vendored
View file

@ -9,10 +9,10 @@
<File DiskId="1" KeyPath="yes" Name="libcurl.dll" /> <File DiskId="1" KeyPath="yes" Name="libcurl.dll" />
</Component> </Component>
<Component Id="dll.openssl.crypto"> <Component Id="dll.openssl.crypto">
<File DiskId="1" KeyPath="yes" Name="libeay32.dll" /> <File DiskId="1" KeyPath="yes" Name="$(var.OpenSslCryptoName)" />
</Component> </Component>
<Component Id="dll.openssl.ssl"> <Component Id="dll.openssl.ssl">
<File DiskId="1" KeyPath="yes" Name="ssleay32.dll" /> <File DiskId="1" KeyPath="yes" Name="$(var.OpenSslSslName)" />
</Component> </Component>
<Component Id="dll.zlib"> <Component Id="dll.zlib">
<File DiskId="1" KeyPath="yes" Name="zlib.dll" /> <File DiskId="1" KeyPath="yes" Name="zlib.dll" />