From 32fdf993ea278c3e5a0ffc62f8144dfd9922ba6c Mon Sep 17 00:00:00 2001
From: erihel <erihel@gmail.com>
Date: Sat, 20 Apr 2013 19:41:39 +0200
Subject: * Changed order of libs in cmake for clipboard

---
 src/CMakeLists.txt          | 2 +-
 test/unit/CMakeLists.txt    | 2 +-
 test/unit/ui/CMakeLists.txt | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d9c3d57..26c02bc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -186,6 +186,7 @@ ${OPENAL_SRC}
 
 set(LIBS
 CBot
+clipboard
 ${SDL_LIBRARY}
 ${SDLIMAGE_LIBRARY}
 ${SDLTTF_LIBRARY}
@@ -196,7 +197,6 @@ ${Boost_LIBRARIES}
 ${LIBSNDFILE_LIBRARY}
 ${OPTIONAL_LIBS}
 ${PLATFORM_LIBS}
-clipboard
 )
 
 # Local
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index 9953fc8..62aed10 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -211,6 +211,7 @@ set(LIBS
 gtest
 gmock
 CBot
+clipboard
 ${SDL_LIBRARY}
 ${SDLIMAGE_LIBRARY}
 ${SDLTTF_LIBRARY}
@@ -221,7 +222,6 @@ ${Boost_LIBRARIES}
 ${OPTIONAL_LIBS}
 ${PLATFORM_LIBS}
 ${LIBSNDFILE_LIBRARY}
-clipboard
 )
 
 add_executable(colobot_ut ${COLOBOT_SOURCES} ${UT_SOURCES} ${OPENAL_SOURCES})
diff --git a/test/unit/ui/CMakeLists.txt b/test/unit/ui/CMakeLists.txt
index 041d4a1..148e45e 100644
--- a/test/unit/ui/CMakeLists.txt
+++ b/test/unit/ui/CMakeLists.txt
@@ -13,10 +13,10 @@ if (${PLATFORM_WINDOWS})
     set(SYSTEM_CPP_MODULE "system_windows.cpp")
 elseif(${PLATFORM_LINUX})
     set(SYSTEM_CPP_MODULE "system_linux.cpp")
-    set(ADDITIONAL_LIB X11)
+    set(ADDITIONAL_LIB "-lX11")
 else()
     set(SYSTEM_CPP_MODULE "system_other.cpp")
-    set(ADDITIONAL_LIB X11)
+    set(ADDITIONAL_LIB "-lX11")
 endif()
 
 add_executable(edit_test
@@ -40,7 +40,7 @@ stubs/restext_stub.cpp
 stubs/robotmain_stub.cpp
 edit_test.cpp)
 
-target_link_libraries(edit_test gtest gmock ${SDL_LIBRARY} ${SDLTTF_LIBRARY} ${Boost_LIBRARIES} ${ADDITIONAL_LIB} clipboard)
+target_link_libraries(edit_test gtest gmock clipboard ${SDL_LIBRARY} ${SDLTTF_LIBRARY} ${Boost_LIBRARIES} ${ADDITIONAL_LIB})
 
 
 
-- 
cgit v1.2.3-1-g7c22