diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-06-24 13:28:18 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-06-24 14:17:28 +0200 |
commit | 81a6de41a5f6f5a4340e834dfd4ca965ed694924 (patch) | |
tree | 80b5b4f8b004f2314f2a648e2c7531aaa1b7ae79 /src/CMakeLists.txt | |
parent | 3e989c96dff7889aff5b6476bf2a8fb9c541bd95 (diff) | |
download | colobot-81a6de41a5f6f5a4340e834dfd4ca965ed694924.tar.gz colobot-81a6de41a5f6f5a4340e834dfd4ca965ed694924.tar.bz2 colobot-81a6de41a5f6f5a4340e834dfd4ca965ed694924.zip |
Some further changes in CMakeLists
* removed DEV_BUILD autodetection (could be confusing)
* ignore desktop subdirectory on Windows
* some refactoring
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r-- | src/CMakeLists.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6f93532..40373a3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_CXX_FLAGS_DEBUG ${COLOBOT_CXX_FLAGS_DEBUG}) add_subdirectory(CBot) -if(${TOOLS}) +if(TOOLS) add_subdirectory(tools) endif() @@ -17,18 +17,18 @@ endif() set(OPTIONAL_LIBS "") set(OPTIONAL_INCLUDES "") -if (${OPENAL_SOUND}) +if(OPENAL_SOUND) set(OPTIONAL_LIBS ${OPENAL_LIBRARY}) set(OPTIONAL_INCLUDES ${OPENAL_INCLUDE_DIR}) endif() # Additional libraries per platform -if (${MXE}) # MXE requires special treatment +if(MXE) # MXE requires special treatment set(PLATFORM_LIBS ${MXE_LIBS}) -elseif (${PLATFORM_WINDOWS}) +elseif(PLATFORM_WINDOWS) # because it isn't included in standard linking libraries set(PLATFORM_LIBS "-lintl") -elseif(${PLATFORM_LINUX}) +elseif(PLATFORM_LINUX) # for clock_gettime set(PLATFORM_LIBS "-lrt -lX11") endif() @@ -39,7 +39,7 @@ configure_file(common/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/common/config.h set(OPENAL_SRC "") -if (${OPENAL_SOUND}) +if(OPENAL_SOUND) set(OPENAL_SRC sound/oalsound/alsound.cpp sound/oalsound/buffer.cpp @@ -48,9 +48,9 @@ if (${OPENAL_SOUND}) endif() # Platform-dependent implementation of system.h -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") else() set(SYSTEM_CPP_MODULE "system_other.cpp") |