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

Merge pull request #6591 from symless/v1-issue-6556-static-ssl 

Fixed OpenSSL not actually statically linking
This commit is contained in:
Jnewbon 2019-11-01 15:24:09 +00:00 committed by GitHub
parent 5e19349e2e 136996a9a9
commit e61f33a3e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -306,7 +306,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
) )
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(OPENSSL_USE_STATIC_LIBS TRUE) 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 ${libs} ${OPENSSL_LIBS}) arch base client common io mt net ipc platform server synlib ${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})

2
src/lib/platform/MSWindowsScreen.cpp
View File

@ -561,7 +561,7 @@ bool MSWindowsScreen::getThisCursorPos(LPPOINT pos)
{ {
result = GetCursorPos(pos); result = GetCursorPos(pos);
error = GetLastError(); error = GetLastError();
LOG((CLOG_INFO "%s Attempt: 2, status %d, code: %d Pos {%d, %d}", __func__, result, error, pos->x, pos->y)); LOG((CLOG_DEBUG3 "%s Attempt: 2, status %d, code: %d Pos {%d, %d}", __func__, result, error, pos->x, pos->y));
updateDesktopThread(); updateDesktopThread();
} }
return result; return result;