removed 'lib' prefix from libraries (cmake does this for us automatically on UNIX)
This commit is contained in:
parent
66c4bdc356
commit
8472fec34d
|
@ -56,5 +56,4 @@ endif()
|
||||||
include_directories(${inc})
|
include_directories(${inc})
|
||||||
add_executable(synergyc ${src})
|
add_executable(synergyc ${src})
|
||||||
target_link_libraries(synergyc
|
target_link_libraries(synergyc
|
||||||
libarch libbase libclient libcommon libio libmt libnet libplatform
|
arch base client common io mt net platform server synergy ${libs})
|
||||||
libserver libsynergy ${libs})
|
|
||||||
|
|
|
@ -58,5 +58,4 @@ endif()
|
||||||
include_directories(${inc})
|
include_directories(${inc})
|
||||||
add_executable(synergys ${src})
|
add_executable(synergys ${src})
|
||||||
target_link_libraries(synergys
|
target_link_libraries(synergys
|
||||||
libarch libbase libclient libcommon libio libmt libnet libplatform
|
arch base client common io mt net platform server synergy ${libs})
|
||||||
libserver libsynergy ${libs})
|
|
||||||
|
|
|
@ -62,5 +62,4 @@ endif()
|
||||||
include_directories(${inc})
|
include_directories(${inc})
|
||||||
add_executable(integtests ${src})
|
add_executable(integtests ${src})
|
||||||
target_link_libraries(integtests
|
target_link_libraries(integtests
|
||||||
libarch libbase libclient libcommon libio libmt libnet libplatform
|
arch base client common io mt net platform server synergy gtest ${libs})
|
||||||
libserver libsynergy gtest ${libs})
|
|
||||||
|
|
|
@ -97,4 +97,4 @@ if (UNIX)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(${inc})
|
include_directories(${inc})
|
||||||
add_library(libarch STATIC ${src})
|
add_library(arch STATIC ${src})
|
||||||
|
|
|
@ -70,4 +70,4 @@ if (UNIX)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(${inc})
|
include_directories(${inc})
|
||||||
add_library(libbase STATIC ${src})
|
add_library(base STATIC ${src})
|
||||||
|
|
|
@ -45,9 +45,8 @@ if (UNIX)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(${inc})
|
include_directories(${inc})
|
||||||
add_library(libclient STATIC ${src})
|
add_library(client STATIC ${src})
|
||||||
|
|
||||||
if (UNIX)
|
if (UNIX)
|
||||||
target_link_libraries(libclient
|
target_link_libraries(client synergy io)
|
||||||
libsynergy libio)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -31,4 +31,4 @@ if (UNIX)
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_library(libcommon STATIC ${src})
|
add_library(common STATIC ${src})
|
||||||
|
|
|
@ -44,4 +44,4 @@ if (UNIX)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(${inc})
|
include_directories(${inc})
|
||||||
add_library(libio STATIC ${src})
|
add_library(io STATIC ${src})
|
||||||
|
|
|
@ -48,4 +48,4 @@ if (UNIX)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(${inc})
|
include_directories(${inc})
|
||||||
add_library(libmt STATIC ${src})
|
add_library(mt STATIC ${src})
|
||||||
|
|
|
@ -60,9 +60,8 @@ if (UNIX)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(${inc})
|
include_directories(${inc})
|
||||||
add_library(libnet STATIC ${src})
|
add_library(net STATIC ${src})
|
||||||
|
|
||||||
if (UNIX)
|
if (UNIX)
|
||||||
target_link_libraries(libnet
|
target_link_libraries(net mt io)
|
||||||
libmt libio)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -104,13 +104,12 @@ if (UNIX)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(${inc})
|
include_directories(${inc})
|
||||||
add_library(libplatform STATIC ${src})
|
add_library(platform STATIC ${src})
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
add_library(synrgyhk SHARED ${inc_hook} ${src_hook})
|
add_library(synrgyhk SHARED ${inc_hook} ${src_hook})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (UNIX)
|
if (UNIX)
|
||||||
target_link_libraries(libplatform
|
target_link_libraries(platform synergy)
|
||||||
libsynergy)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -64,9 +64,8 @@ if (UNIX)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(${inc})
|
include_directories(${inc})
|
||||||
add_library(libserver STATIC ${src})
|
add_library(server STATIC ${src})
|
||||||
|
|
||||||
if (UNIX)
|
if (UNIX)
|
||||||
target_link_libraries(libserver
|
target_link_libraries(server synergy)
|
||||||
libsynergy)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -90,9 +90,8 @@ if (UNIX)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(${inc})
|
include_directories(${inc})
|
||||||
add_library(libsynergy STATIC ${src})
|
add_library(synergy STATIC ${src})
|
||||||
|
|
||||||
if (UNIX)
|
if (UNIX)
|
||||||
target_link_libraries(libsynergy
|
target_link_libraries(synergy arch client net base platform mt server)
|
||||||
libarch libclient libnet libbase libplatform libmt libserver)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -40,5 +40,4 @@ endif()
|
||||||
include_directories(${inc})
|
include_directories(${inc})
|
||||||
add_executable(unittests ${src})
|
add_executable(unittests ${src})
|
||||||
target_link_libraries(unittests
|
target_link_libraries(unittests
|
||||||
libarch libbase libclient libcommon libio libmt libnet libplatform
|
arch base client common io mt net platform server synergy gtest ${libs})
|
||||||
libserver libsynergy gtest ${libs})
|
|
||||||
|
|
Loading…
Reference in New Issue