From 8472fec34dcb9c01a8144680ef79a4a9451f0104 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Mon, 25 Apr 2011 22:21:32 +0000 Subject: [PATCH] removed 'lib' prefix from libraries (cmake does this for us automatically on UNIX) --- src/cmd/synergyc/CMakeLists.txt | 3 +-- src/cmd/synergys/CMakeLists.txt | 3 +-- src/integtests/CMakeLists.txt | 3 +-- src/lib/arch/CMakeLists.txt | 2 +- src/lib/base/CMakeLists.txt | 2 +- src/lib/client/CMakeLists.txt | 5 ++--- src/lib/common/CMakeLists.txt | 2 +- src/lib/io/CMakeLists.txt | 2 +- src/lib/mt/CMakeLists.txt | 2 +- src/lib/net/CMakeLists.txt | 5 ++--- src/lib/platform/CMakeLists.txt | 5 ++--- src/lib/server/CMakeLists.txt | 5 ++--- src/lib/synergy/CMakeLists.txt | 5 ++--- src/unittests/CMakeLists.txt | 3 +-- 14 files changed, 19 insertions(+), 28 deletions(-) diff --git a/src/cmd/synergyc/CMakeLists.txt b/src/cmd/synergyc/CMakeLists.txt index fa2eb11e..0daefdf9 100644 --- a/src/cmd/synergyc/CMakeLists.txt +++ b/src/cmd/synergyc/CMakeLists.txt @@ -56,5 +56,4 @@ endif() include_directories(${inc}) add_executable(synergyc ${src}) target_link_libraries(synergyc - libarch libbase libclient libcommon libio libmt libnet libplatform - libserver libsynergy ${libs}) + arch base client common io mt net platform server synergy ${libs}) diff --git a/src/cmd/synergys/CMakeLists.txt b/src/cmd/synergys/CMakeLists.txt index f24a7bf0..d00a3ecb 100644 --- a/src/cmd/synergys/CMakeLists.txt +++ b/src/cmd/synergys/CMakeLists.txt @@ -58,5 +58,4 @@ endif() include_directories(${inc}) add_executable(synergys ${src}) target_link_libraries(synergys - libarch libbase libclient libcommon libio libmt libnet libplatform - libserver libsynergy ${libs}) + arch base client common io mt net platform server synergy ${libs}) diff --git a/src/integtests/CMakeLists.txt b/src/integtests/CMakeLists.txt index c62dcae2..822b22b6 100644 --- a/src/integtests/CMakeLists.txt +++ b/src/integtests/CMakeLists.txt @@ -62,5 +62,4 @@ endif() include_directories(${inc}) add_executable(integtests ${src}) target_link_libraries(integtests - libarch libbase libclient libcommon libio libmt libnet libplatform - libserver libsynergy gtest ${libs}) + arch base client common io mt net platform server synergy gtest ${libs}) diff --git a/src/lib/arch/CMakeLists.txt b/src/lib/arch/CMakeLists.txt index 061abdf9..3bd6f2bd 100644 --- a/src/lib/arch/CMakeLists.txt +++ b/src/lib/arch/CMakeLists.txt @@ -97,4 +97,4 @@ if (UNIX) endif() include_directories(${inc}) -add_library(libarch STATIC ${src}) +add_library(arch STATIC ${src}) diff --git a/src/lib/base/CMakeLists.txt b/src/lib/base/CMakeLists.txt index 06271384..41e7e608 100644 --- a/src/lib/base/CMakeLists.txt +++ b/src/lib/base/CMakeLists.txt @@ -70,4 +70,4 @@ if (UNIX) endif() include_directories(${inc}) -add_library(libbase STATIC ${src}) +add_library(base STATIC ${src}) diff --git a/src/lib/client/CMakeLists.txt b/src/lib/client/CMakeLists.txt index 8b4e7380..44e54ab1 100644 --- a/src/lib/client/CMakeLists.txt +++ b/src/lib/client/CMakeLists.txt @@ -45,9 +45,8 @@ if (UNIX) endif() include_directories(${inc}) -add_library(libclient STATIC ${src}) +add_library(client STATIC ${src}) if (UNIX) - target_link_libraries(libclient - libsynergy libio) + target_link_libraries(client synergy io) endif() diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt index b84d0230..a92eb1b7 100644 --- a/src/lib/common/CMakeLists.txt +++ b/src/lib/common/CMakeLists.txt @@ -31,4 +31,4 @@ if (UNIX) ) endif() -add_library(libcommon STATIC ${src}) +add_library(common STATIC ${src}) diff --git a/src/lib/io/CMakeLists.txt b/src/lib/io/CMakeLists.txt index 3997d91a..2c87c4ba 100644 --- a/src/lib/io/CMakeLists.txt +++ b/src/lib/io/CMakeLists.txt @@ -44,4 +44,4 @@ if (UNIX) endif() include_directories(${inc}) -add_library(libio STATIC ${src}) +add_library(io STATIC ${src}) diff --git a/src/lib/mt/CMakeLists.txt b/src/lib/mt/CMakeLists.txt index 056c112b..e42ee7d9 100644 --- a/src/lib/mt/CMakeLists.txt +++ b/src/lib/mt/CMakeLists.txt @@ -48,4 +48,4 @@ if (UNIX) endif() include_directories(${inc}) -add_library(libmt STATIC ${src}) +add_library(mt STATIC ${src}) diff --git a/src/lib/net/CMakeLists.txt b/src/lib/net/CMakeLists.txt index d9d1863e..5736a892 100644 --- a/src/lib/net/CMakeLists.txt +++ b/src/lib/net/CMakeLists.txt @@ -60,9 +60,8 @@ if (UNIX) endif() include_directories(${inc}) -add_library(libnet STATIC ${src}) +add_library(net STATIC ${src}) if (UNIX) - target_link_libraries(libnet - libmt libio) + target_link_libraries(net mt io) endif() diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt index 5ebb90ea..44fd51e1 100644 --- a/src/lib/platform/CMakeLists.txt +++ b/src/lib/platform/CMakeLists.txt @@ -104,13 +104,12 @@ if (UNIX) endif() include_directories(${inc}) -add_library(libplatform STATIC ${src}) +add_library(platform STATIC ${src}) if (WIN32) add_library(synrgyhk SHARED ${inc_hook} ${src_hook}) endif() if (UNIX) - target_link_libraries(libplatform - libsynergy) + target_link_libraries(platform synergy) endif() diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt index f63ee458..b6460956 100644 --- a/src/lib/server/CMakeLists.txt +++ b/src/lib/server/CMakeLists.txt @@ -64,9 +64,8 @@ if (UNIX) endif() include_directories(${inc}) -add_library(libserver STATIC ${src}) +add_library(server STATIC ${src}) if (UNIX) - target_link_libraries(libserver - libsynergy) + target_link_libraries(server synergy) endif() diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/synergy/CMakeLists.txt index b16d6fd1..60fc5576 100644 --- a/src/lib/synergy/CMakeLists.txt +++ b/src/lib/synergy/CMakeLists.txt @@ -90,9 +90,8 @@ if (UNIX) endif() include_directories(${inc}) -add_library(libsynergy STATIC ${src}) +add_library(synergy STATIC ${src}) if (UNIX) - target_link_libraries(libsynergy - libarch libclient libnet libbase libplatform libmt libserver) + target_link_libraries(synergy arch client net base platform mt server) endif() diff --git a/src/unittests/CMakeLists.txt b/src/unittests/CMakeLists.txt index 66387067..bff396ba 100644 --- a/src/unittests/CMakeLists.txt +++ b/src/unittests/CMakeLists.txt @@ -40,5 +40,4 @@ endif() include_directories(${inc}) add_executable(unittests ${src}) target_link_libraries(unittests - libarch libbase libclient libcommon libio libmt libnet libplatform - libserver libsynergy gtest ${libs}) + arch base client common io mt net platform server synergy gtest ${libs})