Rename synergy library to synlib to work around conflict with GUI
This commit is contained in:
parent
31a7fb395c
commit
4263fd1717
|
@ -58,7 +58,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 synergy ${libs} ${OPENSSL_LIBS})
|
arch base client common io mt net ipc platform server synlib ${libs} ${OPENSSL_LIBS})
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
else ()
|
else ()
|
||||||
|
|
|
@ -35,7 +35,7 @@ else()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_link_libraries(synergyd
|
target_link_libraries(synergyd
|
||||||
arch base common io ipc mt net platform synergy shared ${libs} ${OPENSSL_LIBS})
|
arch base common io ipc mt net platform synlib shared ${libs} ${OPENSSL_LIBS})
|
||||||
|
|
||||||
if (CONF_CPACK)
|
if (CONF_CPACK)
|
||||||
install(TARGETS
|
install(TARGETS
|
||||||
|
|
|
@ -58,7 +58,7 @@ endif()
|
||||||
|
|
||||||
add_executable(synergys ${sources})
|
add_executable(synergys ${sources})
|
||||||
target_link_libraries(synergys
|
target_link_libraries(synergys
|
||||||
arch base client common io mt net ipc platform server synergy ${libs} ${OPENSSL_LIBS})
|
arch base client common io mt net ipc platform server synlib ${libs} ${OPENSSL_LIBS})
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
else ()
|
else ()
|
||||||
|
|
|
@ -29,7 +29,7 @@ endif()
|
||||||
|
|
||||||
add_executable(syntool ${sources})
|
add_executable(syntool ${sources})
|
||||||
target_link_libraries(syntool
|
target_link_libraries(syntool
|
||||||
synergy arch base client common io ipc mt net platform server ${libs} ${OPENSSL_LIBS})
|
synlib arch base client common io ipc mt net platform server ${libs} ${OPENSSL_LIBS})
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
else ()
|
else ()
|
||||||
|
|
|
@ -36,5 +36,5 @@ endif()
|
||||||
add_library(client STATIC ${sources})
|
add_library(client STATIC ${sources})
|
||||||
|
|
||||||
if (UNIX)
|
if (UNIX)
|
||||||
target_link_libraries(client synergy io)
|
target_link_libraries(client synlib io)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -34,5 +34,5 @@ endif()
|
||||||
add_library(ipc STATIC ${sources})
|
add_library(ipc STATIC ${sources})
|
||||||
|
|
||||||
if (UNIX)
|
if (UNIX)
|
||||||
target_link_libraries(ipc arch base common mt io net synergy)
|
target_link_libraries(ipc arch base common mt io net synlib)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -51,7 +51,7 @@ add_library(platform STATIC ${sources})
|
||||||
target_link_libraries(platform client ${libs})
|
target_link_libraries(platform client ${libs})
|
||||||
|
|
||||||
if (UNIX)
|
if (UNIX)
|
||||||
target_link_libraries(platform io net ipc synergy client ${libs})
|
target_link_libraries(platform io net ipc synlib client ${libs})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
|
|
|
@ -38,5 +38,5 @@ add_library(server STATIC ${sources})
|
||||||
target_link_libraries(server shared)
|
target_link_libraries(server shared)
|
||||||
|
|
||||||
if (UNIX)
|
if (UNIX)
|
||||||
target_link_libraries(server synergy)
|
target_link_libraries(server synlib)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -45,8 +45,8 @@ if (UNIX)
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_library(synergy STATIC ${sources})
|
add_library(synlib STATIC ${sources})
|
||||||
|
|
||||||
if (UNIX)
|
if (UNIX)
|
||||||
target_link_libraries(synergy arch client ipc net base platform mt server)
|
target_link_libraries(synlib arch client ipc net base platform mt server)
|
||||||
endif()
|
endif()
|
||||||
|
|
Loading…
Reference in New Issue