immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consolidate SYSTEM_CPP_MODULE in the main CMakeLists.txt

dev-ui
Didier 'OdyX' Raboud 2013-11-20 10:39:06 +01:00
parent 4e2ac61ee6
commit 89e2855f95
5 changed files with 19 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -45,12 +45,18 @@ if("${CMAKE_SYSTEM_NAME}" MATCHES "Windows")
set(PLATFORM_LINUX 0) set(PLATFORM_LINUX 0)
set(PLATFORM_MACOSX 0) set(PLATFORM_MACOSX 0)
set(PLATFORM_OTHER 0) set(PLATFORM_OTHER 0)
# Platform-dependent implementation of system.h
set(SYSTEM_CPP_MODULE "system_windows.cpp")
elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
message(STATUS "Build for Linux system") message(STATUS "Build for Linux system")
set(PLATFORM_WINDOWS 0) set(PLATFORM_WINDOWS 0)
set(PLATFORM_LINUX 1) set(PLATFORM_LINUX 1)
set(PLATFORM_MACOSX 0) set(PLATFORM_MACOSX 0)
set(PLATFORM_OTHER 0) set(PLATFORM_OTHER 0)
# Platform-dependent implementation of system.h
set(SYSTEM_CPP_MODULE "system_linux.cpp")
elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin") elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
message(STATUS "Build for Mac OSX system") message(STATUS "Build for Mac OSX system")
set(PLATFORM_WINDOWS 0) set(PLATFORM_WINDOWS 0)
@ -58,6 +64,9 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
set(PLATFORM_MACOSX 1) set(PLATFORM_MACOSX 1)
set(PLATFORM_OTHER 0) set(PLATFORM_OTHER 0)
# Platform-dependent implementation of system.h
set(SYSTEM_CPP_MODULE "system_macosx.cpp")
set(USE_SDL_MAIN 1) # fixes SDL_main set(USE_SDL_MAIN 1) # fixes SDL_main
else() else()
message(STATUS "Build for other system") message(STATUS "Build for other system")
@ -65,6 +74,9 @@ else()
set(PLATFORM_LINUX 0) set(PLATFORM_LINUX 0)
set(PLATFORM_MACOSX 0) set(PLATFORM_MACOSX 0)
set(PLATFORM_OTHER 1) set(PLATFORM_OTHER 1)
# Platform-dependent implementation of system.h
set(SYSTEM_CPP_MODULE "system_other.cpp")
endif() endif()

13
src/CMakeLists.txt
View File

@ -56,24 +56,13 @@ if(PLATFORM_WINDOWS)
set(RES_FILES "../desktop/colobot.rc") set(RES_FILES "../desktop/colobot.rc")
endif() endif()
# 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")
elseif(PLATFORM_MACOSX)
set(SYSTEM_CPP_MODULE "system_macosx.cpp")
set(SYSTEM_CPP_MODULE ${SYSTEM_CPP_MODULE} "app/system_other.cpp")
else()
set(SYSTEM_CPP_MODULE "system_other.cpp")
endif()
# Source files # Source files
set(SOURCES set(SOURCES
app/app.cpp app/app.cpp
app/main.cpp app/main.cpp
app/system.cpp app/system.cpp
app/${SYSTEM_CPP_MODULE} app/${SYSTEM_CPP_MODULE}
app/system_other.cpp
common/event.cpp common/event.cpp
common/image.cpp common/image.cpp
common/iman.cpp common/iman.cpp

13
test/envs/opengl/CMakeLists.txt
View File

@ -2,15 +2,6 @@ set(SRC_DIR ${colobot_SOURCE_DIR}/src)
configure_file(${SRC_DIR}/common/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/common/config.h) 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()
set(TEXTURE_SOURCES set(TEXTURE_SOURCES
${SRC_DIR}/graphics/core/color.cpp ${SRC_DIR}/graphics/core/color.cpp
${SRC_DIR}/graphics/opengl/gldevice.cpp ${SRC_DIR}/graphics/opengl/gldevice.cpp
@ -28,6 +19,7 @@ ${SRC_DIR}/common/image.cpp
${SRC_DIR}/common/stringutils.cpp ${SRC_DIR}/common/stringutils.cpp
${SRC_DIR}/app/system.cpp ${SRC_DIR}/app/system.cpp
${SRC_DIR}/app/${SYSTEM_CPP_MODULE} ${SRC_DIR}/app/${SYSTEM_CPP_MODULE}
${SRC_DIR}/app/system_other.cpp
model_test.cpp model_test.cpp
) )
@ -38,6 +30,7 @@ ${SRC_DIR}/common/logger.cpp
${SRC_DIR}/common/image.cpp ${SRC_DIR}/common/image.cpp
${SRC_DIR}/app/system.cpp ${SRC_DIR}/app/system.cpp
${SRC_DIR}/app/${SYSTEM_CPP_MODULE} ${SRC_DIR}/app/${SYSTEM_CPP_MODULE}
${SRC_DIR}/app/system_other.cpp
transform_test.cpp transform_test.cpp
) )
@ -48,6 +41,7 @@ ${SRC_DIR}/common/logger.cpp
${SRC_DIR}/common/image.cpp ${SRC_DIR}/common/image.cpp
${SRC_DIR}/app/system.cpp ${SRC_DIR}/app/system.cpp
${SRC_DIR}/app/${SYSTEM_CPP_MODULE} ${SRC_DIR}/app/${SYSTEM_CPP_MODULE}
${SRC_DIR}/app/system_other.cpp
light_test.cpp light_test.cpp
) )
@ -68,6 +62,7 @@ ${SDLIMAGE_LIBRARY}
${OPENGL_LIBRARY} ${OPENGL_LIBRARY}
${GLEW_LIBRARY} ${GLEW_LIBRARY}
${PNG_LIBRARIES} ${PNG_LIBRARIES}
${Boost_LIBRARIES}
) )
add_executable(texture_test ${TEXTURE_SOURCES}) add_executable(texture_test ${TEXTURE_SOURCES})

10
test/unit/CMakeLists.txt
View File

@ -18,20 +18,12 @@ endif()
# Configure file # Configure file
configure_file(${SRC_DIR}/common/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/common/config.h) 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 # Code sources
set(COLOBOT_SOURCES set(COLOBOT_SOURCES
${SRC_DIR}/app/app.cpp ${SRC_DIR}/app/app.cpp
${SRC_DIR}/app/system.cpp ${SRC_DIR}/app/system.cpp
${SRC_DIR}/app/${SYSTEM_CPP_MODULE} ${SRC_DIR}/app/${SYSTEM_CPP_MODULE}
${SRC_DIR}/app/system_other.cpp
${SRC_DIR}/common/event.cpp ${SRC_DIR}/common/event.cpp
${SRC_DIR}/common/image.cpp ${SRC_DIR}/common/image.cpp
${SRC_DIR}/common/iman.cpp ${SRC_DIR}/common/iman.cpp

5
test/unit/ui/CMakeLists.txt
View File

@ -10,21 +10,18 @@ ${CLIPBOARD_INCLUDE_DIR}
# Platform-dependent implementation of CSystemUtils # Platform-dependent implementation of CSystemUtils
if(PLATFORM_WINDOWS) if(PLATFORM_WINDOWS)
set(SYSTEM_CPP_MODULE "system_windows.cpp")
elseif(PLATFORM_LINUX) elseif(PLATFORM_LINUX)
set(SYSTEM_CPP_MODULE "system_linux.cpp")
set(ADDITIONAL_LIB "-lX11") set(ADDITIONAL_LIB "-lX11")
elseif(PLATFORM_MACOSX) elseif(PLATFORM_MACOSX)
set(SYSTEM_CPP_MODULE "system_other.cpp")
set(ADDITIONAL_LIB "${X11_X11_LIB}") set(ADDITIONAL_LIB "${X11_X11_LIB}")
else() else()
set(SYSTEM_CPP_MODULE "system_other.cpp")
set(ADDITIONAL_LIB "-lX11") set(ADDITIONAL_LIB "-lX11")
endif() endif()
add_executable(edit_test add_executable(edit_test
${SRC_DIR}/app/system.cpp ${SRC_DIR}/app/system.cpp
${SRC_DIR}/app/${SYSTEM_CPP_MODULE} ${SRC_DIR}/app/${SYSTEM_CPP_MODULE}
${SRC_DIR}/app/system_other.cpp
${SRC_DIR}/common/event.cpp ${SRC_DIR}/common/event.cpp
${SRC_DIR}/common/logger.cpp ${SRC_DIR}/common/logger.cpp
${SRC_DIR}/common/misc.cpp ${SRC_DIR}/common/misc.cpp