From 5f03fdb4bef92419da9281000051ae74c2e82e0c Mon Sep 17 00:00:00 2001 From: Michael Schuldt Date: Wed, 10 Apr 2013 10:09:07 +0200 Subject: [PATCH] build: Allow to set CMAKE_CXX_FLAGS from outside - 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 --- cmake/modules/CustomMacros.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- 2.7.4