summaryrefslogtreecommitdiffstats
path: root/src/sound
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/sound
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/sound')
-rw-r--r--src/sound/plugins/oalsound/CMakeLists.txt3
-rw-r--r--src/sound/plugins/oalsound/test/CMakeLists.txt3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/sound/plugins/oalsound/CMakeLists.txt b/src/sound/plugins/oalsound/CMakeLists.txt
index 0bc9482..bb7e9ff 100644
--- a/src/sound/plugins/oalsound/CMakeLists.txt
+++ b/src/sound/plugins/oalsound/CMakeLists.txt
@@ -6,7 +6,8 @@ set(SOURCES
channel.cpp
)
-SET (CMAKE_CXX_FLAGS "-Wall -g -std=c++0x -fPIC")
+SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++0x -fPIC")
+SET (CMAKE_CXX_FLAGS_DEBUG "-g")
include(FindPkgConfig)
include(FindOpenAL)
diff --git a/src/sound/plugins/oalsound/test/CMakeLists.txt b/src/sound/plugins/oalsound/test/CMakeLists.txt
index 27ab756..dd208ea 100644
--- a/src/sound/plugins/oalsound/test/CMakeLists.txt
+++ b/src/sound/plugins/oalsound/test/CMakeLists.txt
@@ -3,7 +3,8 @@ cmake_minimum_required(VERSION 2.8)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE debug)
endif(NOT CMAKE_BUILD_TYPE)
-set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -O0 -std=c++11 -rdynamic")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -rdynamic")
+set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
add_executable(plugin_test plugin_test.cpp ../../../../common/iman.cpp ../../../../common/logger.cpp ../../../../plugins/pluginloader.cpp)