From e912cc4510fe9187f5928b327214b3b7383ecbbb Mon Sep 17 00:00:00 2001 From: heinrich5991 Date: Thu, 13 Feb 2020 10:43:16 +0100 Subject: [PATCH] Don't look for libcrypto if bundling libcurl This prevents accidental dependence on one specific version of libcrypto. --- cmake/FindCurl.cmake | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/cmake/FindCurl.cmake b/cmake/FindCurl.cmake index ac001c95b..d94c167c7 100644 --- a/cmake/FindCurl.cmake +++ b/cmake/FindCurl.cmake @@ -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