summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/unit/CMakeLists.txt6
-rw-r--r--test/unit/ui/CMakeLists.txt6
2 files changed, 6 insertions, 6 deletions
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index 7ad7afd..fbe9e7c 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -8,7 +8,7 @@ elseif (${PLATFORM_WINDOWS})
set(PLATFORM_LIBS "-lintl")
elseif(${PLATFORM_LINUX})
# for clock_gettime
- set(PLATFORM_LIBS "-lrt")
+ set(PLATFORM_LIBS "-lrt -lX11")
endif()
@@ -211,6 +211,7 @@ set(LIBS
gtest
gmock
CBot
+clipboard
${SDL_LIBRARY}
${SDLIMAGE_LIBRARY}
${SDLTTF_LIBRARY}
@@ -221,13 +222,12 @@ ${Boost_LIBRARIES}
${OPTIONAL_LIBS}
${PLATFORM_LIBS}
${LIBSNDFILE_LIBRARY}
-clipboard
)
add_executable(colobot_ut ${COLOBOT_SOURCES} ${UT_SOURCES} ${OPENAL_SOURCES})
target_link_libraries(colobot_ut ${LIBS})
-add_test(colobot_ut ./colobot_ut)
+#add_test(colobot_ut ./colobot_ut)
# TODO: change the unit cases to independent automated tests to be included in colobot_ut
add_subdirectory(common)
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})