summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDidier 'OdyX' Raboud <didier@raboud.com>2013-10-23 14:22:20 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2013-10-24 21:12:52 +0200
commitb3b6a40d9ebe0ceeb1ce34f4de8acf57dc07fca0 (patch)
treed74710c846a279aa66450597bd417ef406fefd06 /test
parent485d0baf6704293a28d4fb4b96eb55f7f52cb056 (diff)
downloadcolobot-b3b6a40d9ebe0ceeb1ce34f4de8acf57dc07fca0.tar.gz
colobot-b3b6a40d9ebe0ceeb1ce34f4de8acf57dc07fca0.tar.bz2
colobot-b3b6a40d9ebe0ceeb1ce34f4de8acf57dc07fca0.zip
MacOSX: Add initial support in CMake build infra
Diffstat (limited to 'test')
-rw-r--r--test/unit/CMakeLists.txt2
-rw-r--r--test/unit/ui/CMakeLists.txt3
2 files changed, 5 insertions, 0 deletions
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index d5256ec..34570a6 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -9,6 +9,8 @@ elseif(PLATFORM_WINDOWS)
elseif(PLATFORM_LINUX)
# for clock_gettime
set(PLATFORM_LIBS "-lrt -lX11")
+elseif(PLATFORM_MACOSX)
+ set(PLATFORM_LIBS ${X11_X11_LIB})
endif()
diff --git a/test/unit/ui/CMakeLists.txt b/test/unit/ui/CMakeLists.txt
index a6ab669..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")