rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reverting 9005fe3c, 4d9c196c and f0d7b669. Which reverts static SSL libs

This commit is contained in:
Jamie Newbon 2019-11-04 19:30:22 +00:00
parent e61f33a3e9
commit ebbdee5c4e
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -305,9 +305,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
${OPENSSL_ROOT}/lib/libcrypto.a ${OPENSSL_ROOT}/lib/libcrypto.a
) )
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(OPENSSL_USE_STATIC_LIBS TRUE) set (OPENSSL_LIBS ssl crypto)
find_package(OpenSSL REQUIRED)
set(OPENSSL_LIBS ${OPENSSL_LIBRARIES} pthread dl)
else() else()
message (FATAL_ERROR "Couldn't find OpenSSL") message (FATAL_ERROR "Couldn't find OpenSSL")
endif() endif()

2
src/cmd/synergyc/CMakeLists.txt
View File

@ -48,7 +48,7 @@ endif()
add_executable(synergyc ${sources}) add_executable(synergyc ${sources})
target_link_libraries(synergyc 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") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
install (TARGETS synergyc DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR}) install (TARGETS synergyc DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR})