From ebbdee5c4e204543dbd6396916cba168f70ddbad Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Mon, 4 Nov 2019 19:30:22 +0000 Subject: [PATCH] Reverting 9005fe3c, 4d9c196c and f0d7b669. Which reverts static SSL libs --- CMakeLists.txt | 4 +--- src/cmd/synergyc/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 866b463a..75855d2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -305,9 +305,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ${OPENSSL_ROOT}/lib/libcrypto.a ) elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set(OPENSSL_USE_STATIC_LIBS TRUE) - find_package(OpenSSL REQUIRED) - set(OPENSSL_LIBS ${OPENSSL_LIBRARIES} pthread dl) + set (OPENSSL_LIBS ssl crypto) else() message (FATAL_ERROR "Couldn't find OpenSSL") endif() diff --git a/src/cmd/synergyc/CMakeLists.txt b/src/cmd/synergyc/CMakeLists.txt index ec243d93..f6a9cc32 100644 --- a/src/cmd/synergyc/CMakeLists.txt +++ b/src/cmd/synergyc/CMakeLists.txt @@ -48,7 +48,7 @@ endif() add_executable(synergyc ${sources}) target_link_libraries(synergyc - arch base client common io mt net ipc platform server synlib ${OPENSSL_LIBS}) + arch base client common io mt net ipc platform server synlib ${libs} ${OPENSSL_LIBS}) if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") install (TARGETS synergyc DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR})