edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2064 from heinrich5991/pr_ddnet_unbundlecurl_openssl

Browse source 
Don't look for libcrypto if bundling libcurl
This commit is contained in:
Dennis Felsing 2020-02-13 10:46:56 +01:00 committed by GitHub
parent cd44d6dba7 e912cc4510
commit 8d5762787e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cmake/FindCurl.cmake
View file

@ -26,24 +26,6 @@ if(CURL_FOUND)
is_bundled(CURL_BUNDLED "${CURL_LIBRARY}")
set(CURL_LIBRARIES ${CURL_LIBRARY})
set(CURL_INCLUDE_DIRS ${CURL_INCLUDEDIR})
if(CURL_BUNDLED AND TARGET_OS STREQUAL "linux")
find_library(CURL_LIBRARY_SSL
NAMES ssl
HINTS ${EXTRA_CURL_LIBDIR}
)
find_library(CURL_LIBRARY_CRYPTO
NAMES crypto
HINTS ${EXTRA_CURL_LIBDIR}
)
# If we don't add `dl`, we get a missing reference to `dlclose`:
# ```
# /usr/bin/ld: ../ddnet-libs/curl/linux/lib64/libcrypto.a(dso_dlfcn.o): undefined reference to symbol 'dlclose@@GLIBC_2.2.5'
# ```
#
# Order matters, SSL needs to be linked before CRYPTO, otherwise we also get
# undefined symbols.
list(APPEND CURL_LIBRARIES ${CURL_LIBRARY_SSL} ${CURL_LIBRARY_CRYPTO} dl)
endif()
if(CURL_BUNDLED AND TARGET_OS STREQUAL "windows")
set(CURL_COPY_FILES