From c94dbd39ba2b800f20425e070ad9d800d0bfa318 Mon Sep 17 00:00:00 2001 From: Peter Conrad Date: Fri, 6 Sep 2019 21:26:16 +0200 Subject: [PATCH 1/2] Use appropriate static/dynamic openssl libs for curl --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b32dcc2f5b..d83d4bf23f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,8 @@ macro(FIND_CURL) set (OLD_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) set (CMAKE_FIND_LIBRARY_SUFFIXES .a) find_package(CURL REQUIRED) - list(APPEND CURL_LIBRARIES ssl crypto) + find_package(OpenSSL REQUIRED) + list(APPEND CURL_LIBRARIES ${OPENSSL_LIBRARIES} ${BOOST_THREAD_LIBRARY} ${CMAKE_DL_LIBS}) set (CMAKE_FIND_LIBRARY_SUFFIXES ${OLD_SUFFIXES}) else (NOT WIN32 AND NOT APPLE AND CURL_STATICLIB) find_package(CURL REQUIRED) From 3e3318779b2e1368741850136101aff6bcf5fb17 Mon Sep 17 00:00:00 2001 From: Peter Conrad Date: Sat, 7 Sep 2019 10:07:07 +0200 Subject: [PATCH 2/2] Make sure openssl looks not only for static libs --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d83d4bf23f..cc5f9b6a48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,10 +38,10 @@ include(Utils) # function to help with cUrl macro(FIND_CURL) if (NOT WIN32 AND NOT APPLE AND CURL_STATICLIB) + find_package(OpenSSL REQUIRED) set (OLD_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) set (CMAKE_FIND_LIBRARY_SUFFIXES .a) find_package(CURL REQUIRED) - find_package(OpenSSL REQUIRED) list(APPEND CURL_LIBRARIES ${OPENSSL_LIBRARIES} ${BOOST_THREAD_LIBRARY} ${CMAKE_DL_LIBS}) set (CMAKE_FIND_LIBRARY_SUFFIXES ${OLD_SUFFIXES}) else (NOT WIN32 AND NOT APPLE AND CURL_STATICLIB)