From ddf3fcc4233013e407386e2f7380e060e11a6d02 Mon Sep 17 00:00:00 2001 From: Timo Lotterbach Date: Tue, 12 Mar 2013 01:17:55 -0700 Subject: [PATCH] CMake: fixed compiler settings inheritance test should not inherit the compiler setup from their related projects, since unit tests with gtest/gmock will result in a lot of warnings, if the related project uses strict compiler settings. Signed-off-by: Timo Lotterbach --- 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 d779238..69301f5 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 "${CMAKE_CXX_FLAGS} ${COMPILER_FLAGS_${mode_capital}}") + set(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