From 4263fd17177d7717b04ac6d6ec62efa2f657ed74 Mon Sep 17 00:00:00 2001
From: Andrew Nelless <andrew@symless.com>
Date: Wed, 8 Feb 2017 14:51:59 +0000
Subject: [PATCH] Rename synergy library to synlib to work around conflict with
 GUI

---
 src/cmd/synergyc/CMakeLists.txt | 2 +-
 src/cmd/synergyd/CMakeLists.txt | 2 +-
 src/cmd/synergys/CMakeLists.txt | 2 +-
 src/cmd/syntool/CMakeLists.txt  | 2 +-
 src/lib/client/CMakeLists.txt   | 2 +-
 src/lib/ipc/CMakeLists.txt      | 2 +-
 src/lib/platform/CMakeLists.txt | 2 +-
 src/lib/server/CMakeLists.txt   | 2 +-
 src/lib/synergy/CMakeLists.txt  | 4 ++--
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/cmd/synergyc/CMakeLists.txt b/src/cmd/synergyc/CMakeLists.txt
index b43330db..bc0a1063 100644
--- a/src/cmd/synergyc/CMakeLists.txt
+++ b/src/cmd/synergyc/CMakeLists.txt
@@ -58,7 +58,7 @@ endif()
 
 add_executable(synergyc ${sources})
 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)
 else ()
diff --git a/src/cmd/synergyd/CMakeLists.txt b/src/cmd/synergyd/CMakeLists.txt
index 93784d90..748054dc 100644
--- a/src/cmd/synergyd/CMakeLists.txt
+++ b/src/cmd/synergyd/CMakeLists.txt
@@ -35,7 +35,7 @@ else()
 endif()
 
 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)
     install(TARGETS
diff --git a/src/cmd/synergys/CMakeLists.txt b/src/cmd/synergys/CMakeLists.txt
index e3c61fe7..099c721a 100644
--- a/src/cmd/synergys/CMakeLists.txt
+++ b/src/cmd/synergys/CMakeLists.txt
@@ -58,7 +58,7 @@ endif()
 
 add_executable(synergys ${sources})
 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)
 else ()
diff --git a/src/cmd/syntool/CMakeLists.txt b/src/cmd/syntool/CMakeLists.txt
index b3c497f4..48afb365 100644
--- a/src/cmd/syntool/CMakeLists.txt
+++ b/src/cmd/syntool/CMakeLists.txt
@@ -29,7 +29,7 @@ endif()
 
 add_executable(syntool ${sources})
 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)
 else ()
diff --git a/src/lib/client/CMakeLists.txt b/src/lib/client/CMakeLists.txt
index 4cbbe6b0..8def2e92 100644
--- a/src/lib/client/CMakeLists.txt
+++ b/src/lib/client/CMakeLists.txt
@@ -36,5 +36,5 @@ endif()
 add_library(client STATIC ${sources})
 
 if (UNIX)
-    target_link_libraries(client synergy io)
+    target_link_libraries(client synlib io)
 endif()
diff --git a/src/lib/ipc/CMakeLists.txt b/src/lib/ipc/CMakeLists.txt
index 6438033b..2721c904 100644
--- a/src/lib/ipc/CMakeLists.txt
+++ b/src/lib/ipc/CMakeLists.txt
@@ -34,5 +34,5 @@ endif()
 add_library(ipc STATIC ${sources})
 
 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()
diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt
index b8d07077..1c004970 100644
--- a/src/lib/platform/CMakeLists.txt
+++ b/src/lib/platform/CMakeLists.txt
@@ -51,7 +51,7 @@ add_library(platform STATIC ${sources})
 target_link_libraries(platform client ${libs})
 
 if (UNIX)
-    target_link_libraries(platform io net ipc synergy client ${libs})
+    target_link_libraries(platform io net ipc synlib client ${libs})
 endif()
 
 if (APPLE)
diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt
index 038ea777..71dc30f6 100644
--- a/src/lib/server/CMakeLists.txt
+++ b/src/lib/server/CMakeLists.txt
@@ -38,5 +38,5 @@ add_library(server STATIC ${sources})
 target_link_libraries(server shared)
 
 if (UNIX)
-    target_link_libraries(server synergy)
+    target_link_libraries(server synlib)
 endif()
diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/synergy/CMakeLists.txt
index 64ecd431..e2114f6a 100644
--- a/src/lib/synergy/CMakeLists.txt
+++ b/src/lib/synergy/CMakeLists.txt
@@ -45,8 +45,8 @@ if (UNIX)
     )
 endif()
 
-add_library(synergy STATIC ${sources})
+add_library(synlib STATIC ${sources})
 
 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()