3 files changed, 10 insertions, 16 deletions
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index 1f5e1bc..38bffda 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -18,20 +18,12 @@ endif()
 # Configure file
 configure_file(${SRC_DIR}/common/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/common/config.h)
 
-# Platform-dependent implementation of system.h
-if(PLATFORM_WINDOWS)
-    set(SYSTEM_CPP_MODULE "system_windows.cpp")
-elseif(PLATFORM_LINUX)
-    set(SYSTEM_CPP_MODULE "system_linux.cpp")
-else()
-    set(SYSTEM_CPP_MODULE "system_other.cpp")
-endif()
-
 # Code sources
 set(COLOBOT_SOURCES
 ${SRC_DIR}/app/app.cpp
 ${SRC_DIR}/app/system.cpp
 ${SRC_DIR}/app/${SYSTEM_CPP_MODULE}
+${SRC_DIR}/app/system_other.cpp
 ${SRC_DIR}/common/event.cpp
 ${SRC_DIR}/common/image.cpp
 ${SRC_DIR}/common/iman.cpp
diff --git a/test/unit/common/CMakeLists.txt b/test/unit/common/CMakeLists.txt
index aebf17a..cf37961 100644
--- a/test/unit/common/CMakeLists.txt
+++ b/test/unit/common/CMakeLists.txt
@@ -7,10 +7,15 @@ ${GTEST_INCLUDE_DIR}
 
 add_executable(image_test ${SRC_DIR}/common/image.cpp image_test.cpp)
 target_link_libraries(image_test ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${PNG_LIBRARIES})
+add_test(NAME image_test
+         COMMAND ${CMAKE_BINARY_DIR}/image_test ${CMAKE_SOURCE_DIR}/test/envs/opengl/tex1.png ${CMAKE_BINARY_DIR}/tex1_test.png)
 
 file(COPY colobot.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
-# add_executable(profile_test ${SRC_DIR}/common/profile.cpp ${SRC_DIR}/common/logger.cpp profile_test.cpp)
-# target_link_libraries(profile_test gtest ${Boost_LIBRARIES})
+add_executable(profile_test ${SRC_DIR}/common/profile.cpp ${SRC_DIR}/common/logger.cpp profile_test.cpp)
+set_target_properties(profile_test PROPERTIES COMPILE_DEFINITIONS "DEV_BUILD=1")
+target_link_libraries(profile_test gtest ${Boost_LIBRARIES})
 
-# add_test(profile_test ./profile_test)
+add_test(NAME profile_test
+         COMMAND ${CMAKE_BINARY_DIR}/profile_test
+         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/test/unit/ui/CMakeLists.txt b/test/unit/ui/CMakeLists.txt
index 97dd681..8086967 100644
--- a/test/unit/ui/CMakeLists.txt
+++ b/test/unit/ui/CMakeLists.txt
@@ -10,21 +10,18 @@ ${CLIPBOARD_INCLUDE_DIR}
 
 # Platform-dependent implementation of CSystemUtils
 if(PLATFORM_WINDOWS)
-    set(SYSTEM_CPP_MODULE "system_windows.cpp")
 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")
 endif()
 
 add_executable(edit_test
 ${SRC_DIR}/app/system.cpp
 ${SRC_DIR}/app/${SYSTEM_CPP_MODULE}
+${SRC_DIR}/app/system_other.cpp
 ${SRC_DIR}/common/event.cpp
 ${SRC_DIR}/common/logger.cpp
 ${SRC_DIR}/common/misc.cpp