summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Schuldt <michael.schuldt@bmw.de>2013-04-10 10:09:07 +0200
committerMichael Schuldt <michael.schuldt@bmw.de>2013-04-10 12:52:33 +0200
commit5f03fdb4bef92419da9281000051ae74c2e82e0c (patch)
tree6961bdc046ab3e772d9008e64c8dd77bcfeb7a34
parent0b35e5f887df17ba291f755c036c6f86b4ee5fa8 (diff)
downloadlayer_management-5f03fdb4bef92419da9281000051ae74c2e82e0c.tar.gz
build: Allow to set CMAKE_CXX_FLAGS from outside1_0_1
- due to the plugin refactoring, the CMAKE_CXX_FLAGS handling was changed too. - currently it is not possible to set additional CMAKE_CXX_FLAGS from outside - this patch fixes that issue Signed-off-by: Michael Schuldt <michael.schuldt@bmw.de>
-rw-r--r--cmake/modules/CustomMacros.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/modules/CustomMacros.txt b/cmake/modules/CustomMacros.txt
index 69301f5..d779238 100644
--- a/cmake/modules/CustomMacros.txt
+++ b/cmake/modules/CustomMacros.txt
@@ -26,7 +26,7 @@ ENDMACRO(add_subdirectory_once)
MACRO(project_type mode)
string(TOUPPER ${mode} mode_capital)
- set(CMAKE_CXX_FLAGS "${COMPILER_FLAGS_${mode_capital}}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILER_FLAGS_${mode_capital}}")
set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
if (mode_capital STREQUAL "PLUGIN" AND WITH_STATIC_LIBRARIES)