From 0360f3d41beb1f66bfbfddf16a9727f4368b75f5 Mon Sep 17 00:00:00 2001 From: Aleksandar Donchev Date: Wed, 12 Feb 2014 14:50:15 +0100 Subject: * Applied gmock_propagate_cxx_flags.patch Signed-off-by: Christian Linke --- googleMock/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/googleMock/CMakeLists.txt b/googleMock/CMakeLists.txt index 2569ddb..fdd747c 100644 --- a/googleMock/CMakeLists.txt +++ b/googleMock/CMakeLists.txt @@ -8,7 +8,7 @@ # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to # make it prominent in the GUI. -set (CMAKE_CXX_FLAGS "-std=gnu++0x -D_GNU_SOURCE -Wno-variadic-macros") +set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x -D_GNU_SOURCE -Wno-variadic-macros") option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF) -- cgit v1.2.1