Merge pull request #6591 from symless/v1-issue-6556-static-ssl
Fixed OpenSSL not actually statically linking
This commit is contained in:
commit
e61f33a3e9
|
@ -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()
|
||||||
|
|
|
@ -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})
|
||||||
|
|
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue