diff options
| author | erihel <erihel@gmail.com> | 2013-04-20 19:41:39 +0200 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2013-04-20 19:41:39 +0200 |
| commit | 32fdf993ea278c3e5a0ffc62f8144dfd9922ba6c (patch) | |
| tree | 9b4ef463b2149b2944428d1ffb5d9d6886c43cdb /test | |
| parent | dd180dd88739eb7dd71a6431b2651a18a36599d3 (diff) | |
| download | colobot-32fdf993ea278c3e5a0ffc62f8144dfd9922ba6c.tar.gz colobot-32fdf993ea278c3e5a0ffc62f8144dfd9922ba6c.tar.bz2 colobot-32fdf993ea278c3e5a0ffc62f8144dfd9922ba6c.zip | |
* Changed order of libs in cmake for clipboard
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/unit/ui/CMakeLists.txt | 6 |
2 files changed, 4 insertions, 4 deletions
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}) |