From 89e2855f9577a629d1ca67e87de588815829864e Mon Sep 17 00:00:00 2001 From: Didier 'OdyX' Raboud Date: Wed, 20 Nov 2013 10:39:06 +0100 Subject: Consolidate SYSTEM_CPP_MODULE in the main CMakeLists.txt --- test/unit/CMakeLists.txt | 10 +--------- test/unit/ui/CMakeLists.txt | 5 +---- 2 files changed, 2 insertions(+), 13 deletions(-) (limited to 'test/unit') 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/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 -- cgit v1.2.3-1-g7c22