summaryrefslogtreecommitdiffstats
path: root/src/CBot
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2012-12-19 16:54:58 +0100
committerDidier Raboud <odyx@debian.org>2012-12-19 16:55:00 +0100
commit7e9ef0c042fd14373a129ca8a5ac94e9679daee9 (patch)
treeb34f2c5b0beb3897ba187734bed0679c1e70f909 /src/CBot
parent3c976c040b48caa9f3e75d12a6502e39193ce9a6 (diff)
downloadcolobot-7e9ef0c042fd14373a129ca8a5ac94e9679daee9.tar.gz
colobot-7e9ef0c042fd14373a129ca8a5ac94e9679daee9.tar.bz2
colobot-7e9ef0c042fd14373a129ca8a5ac94e9679daee9.zip
Put common CXX flags in common variables
CMAKE_CXX_FLAGS is taken into account in all builds; build-type-specific flags are appended to it.
Diffstat (limited to 'src/CBot')
-rw-r--r--src/CBot/tests/CBot_console/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/CBot/tests/CBot_console/CMakeLists.txt b/src/CBot/tests/CBot_console/CMakeLists.txt
index 3ba118d..9f0f244 100644
--- a/src/CBot/tests/CBot_console/CMakeLists.txt
+++ b/src/CBot/tests/CBot_console/CMakeLists.txt
@@ -8,8 +8,9 @@ if(NOT CMAKE_BUILD_TYPE)
endif(NOT CMAKE_BUILD_TYPE)
# Global compile flags
-set(CMAKE_CXX_FLAGS_RELEASE "-O2 -Wall -Wold-style-cast -std=gnu++0x")
-set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wold-style-cast -std=gnu++0x")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=gnu++0x")
+set(CMAKE_CXX_FLAGS_RELEASE "-O2")
+set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
# Include cmake directory
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${colobot_SOURCE_DIR}/cmake")