From 4d9c196cae1f3b5aa60695ca191e159c47ad02db Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Fri, 1 Nov 2019 14:53:17 +0000 Subject: [PATCH 1/3] #6556 Fixed cmakes for static SSL linking --- CMakeLists.txt | 3 ++- src/cmd/synergyc/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ac713b3..866b463a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -306,7 +306,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ) 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() message (FATAL_ERROR "Couldn't find OpenSSL") endif() diff --git a/src/cmd/synergyc/CMakeLists.txt b/src/cmd/synergyc/CMakeLists.txt index f6a9cc32..974f9480 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 ${libs} ${OPENSSL_LIBS}) + arch base client common io mt net ipc platform server synlib ) if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") install (TARGETS synergyc DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR}) From 9005fe3ce0d0562926729b08f354cabc1e2644ec Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Fri, 1 Nov 2019 15:12:28 +0000 Subject: [PATCH 2/3] #6556 Fixed cmakes for static SSL linkin --- src/cmd/synergyc/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/synergyc/CMakeLists.txt b/src/cmd/synergyc/CMakeLists.txt index 974f9480..ec243d93 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 ) + arch base client common io mt net ipc platform server synlib ${OPENSSL_LIBS}) if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") install (TARGETS synergyc DESTINATION ${SYNERGY_BUNDLE_BINARY_DIR}) From 136996a9a9703cea03bc5f6b16d7f27ff3cfb933 Mon Sep 17 00:00:00 2001 From: Jamie Newbon Date: Fri, 1 Nov 2019 15:13:03 +0000 Subject: [PATCH 3/3] #6566 Switched info to debug --- src/lib/platform/MSWindowsScreen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/platform/MSWindowsScreen.cpp b/src/lib/platform/MSWindowsScreen.cpp index 03c34e6c..2e291624 100644 --- a/src/lib/platform/MSWindowsScreen.cpp +++ b/src/lib/platform/MSWindowsScreen.cpp @@ -561,7 +561,7 @@ bool MSWindowsScreen::getThisCursorPos(LPPOINT pos) { result = GetCursorPos(pos); 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(); } return result;