diff options
author | Aleksandar Donchev <Aleksander.Donchev@partner.bmw.de> | 2014-02-12 14:50:15 +0100 |
---|---|---|
committer | Christian Linke <christian.linke@bmw.de> | 2014-03-28 16:48:02 +0100 |
commit | 0360f3d41beb1f66bfbfddf16a9727f4368b75f5 (patch) | |
tree | 8f7912a32d3935c5d338b969657ff043d334b1e6 /googleMock | |
parent | 0aac39c5c94dfcd8304ed44c13b0d3d6d1b186fa (diff) | |
download | audiomanager-0360f3d41beb1f66bfbfddf16a9727f4368b75f5.tar.gz |
* Applied gmock_propagate_cxx_flags.patch
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'googleMock')
-rw-r--r-- | googleMock/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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) |