jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve CMake - allow using libcrypto even if libssl is not found

Browse Source 
also remove wrongly placed/duplicate target_sources command
This commit is contained in:
FranciscoPombal
2020-05-14 22:31:51 +01:00
committed by Arvid Norberg
parent 063bb0bbaf
commit bc83cfcc5c
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@@ -632,8 +632,7 @@ set_package_properties(OpenSSL
PURPOSE "Provides HTTPS support to libtorrent"
)
if(OPENSSL_FOUND)
if(TARGET OpenSSL::SSL)
# TODO: needed until https://gitlab.kitware.com/cmake/cmake/issues/19263 is fixed
if(WIN32 AND OPENSSL_USE_STATIC_LIBS)
target_link_libraries(torrent-rasterbar PRIVATE crypt32)
@@ -641,12 +640,12 @@ if(OPENSSL_FOUND)
target_link_libraries(torrent-rasterbar PUBLIC OpenSSL::SSL)
target_compile_definitions(torrent-rasterbar PUBLIC TORRENT_USE_OPENSSL)
target_sources(torrent-rasterbar PRIVATE src/pe_crypto)
endif()
if(OPENSSL_FOUND)
if(TARGET OpenSSL::Crypto)
target_link_libraries(torrent-rasterbar PUBLIC OpenSSL::Crypto)
target_compile_definitions(torrent-rasterbar PUBLIC TORRENT_USE_LIBCRYPTO)
else(OPENSSL_FOUND)
else()
find_public_dependency(LibGcrypt)
set_package_properties(LibGcrypt
PROPERTIES
@@ -659,7 +658,7 @@ else(OPENSSL_FOUND)
target_compile_definitions(torrent-rasterbar PUBLIC TORRENT_USE_LIBGCRYPT)
target_link_libraries(torrent-rasterbar PRIVATE LibGcrypt::LibGcrypt)
endif()
endif(OPENSSL_FOUND)
endif()
if (encryption)
target_sources(torrent-rasterbar PRIVATE src/pe_crypto)