diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-11-03 13:04:57 +0100 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-11-03 13:04:57 +0100 |
| commit | f1c5cd5f82d33d5db5033ea28e1d24a13b2e28a2 (patch) | |
| tree | b9e7e75a2138875ffed59772a2a1c7cf82b7aaa4 /test | |
| parent | ec38c14ee8293b2dc7436e0c06b0c294652c84cc (diff) | |
| parent | d8e50e4eeb2dde3e0d228e2bead29d73494f8874 (diff) | |
| download | colobot-f1c5cd5f82d33d5db5033ea28e1d24a13b2e28a2.tar.gz colobot-f1c5cd5f82d33d5db5033ea28e1d24a13b2e28a2.tar.bz2 colobot-f1c5cd5f82d33d5db5033ea28e1d24a13b2e28a2.zip | |
Colobot Gold 0.1.1-alpha
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | test/unit/ui/CMakeLists.txt | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index 95cf1b1..1f5e1bc 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -9,6 +9,9 @@ elseif(PLATFORM_WINDOWS) elseif(PLATFORM_LINUX) # for clock_gettime set(PLATFORM_LIBS "-lrt -lX11") +elseif(PLATFORM_MACOSX) + find_library(LIBINTL_LIBRARY NAMES intl libintl ) + set(PLATFORM_LIBS ${LIBINTL_LIBRARY} ${X11_X11_LIB}) endif() @@ -232,7 +235,7 @@ ${LIBSNDFILE_LIBRARY} 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 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/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 c18af87..97dd681 100644 --- a/test/unit/ui/CMakeLists.txt +++ b/test/unit/ui/CMakeLists.txt @@ -14,6 +14,9 @@ if(PLATFORM_WINDOWS) elseif(PLATFORM_LINUX) set(SYSTEM_CPP_MODULE "system_linux.cpp") set(ADDITIONAL_LIB "-lX11") +elseif(PLATFORM_MACOSX) + set(SYSTEM_CPP_MODULE "system_other.cpp") + set(ADDITIONAL_LIB "${X11_X11_LIB}") else() set(SYSTEM_CPP_MODULE "system_other.cpp") set(ADDITIONAL_LIB "-lX11") @@ -44,4 +47,4 @@ target_link_libraries(edit_test gtest gmock clipboard ${SDL_LIBRARY} ${SDLTTF_LI -add_test(edit_test ./edit_test) +add_test(edit_test ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/edit_test) |