| From b6fc6c36d359a50503138cd87d7147faf6dff893 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| Date: Sat, 17 Mar 2018 20:52:10 +0100 |
| Subject: [PATCH] Do not overwrite all our build flags |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| Upstream-Status: Inappropriate [embedded specific] |
| |
| Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
| --- |
| cmake/modules/PopplerMacros.cmake | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake |
| index ccb2790..0f392cb 100644 |
| --- a/cmake/modules/PopplerMacros.cmake |
| +++ b/cmake/modules/PopplerMacros.cmake |
| @@ -125,14 +125,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) |
| set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") |
| |
| set(_save_cxxflags "${CMAKE_CXX_FLAGS}") |
| - set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") |
| + set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}") |
| set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") |
| set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") |
| set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}") |
| set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") |
| set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") |
| set(_save_cflags "${CMAKE_C_FLAGS}") |
| - set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") |
| + set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") |
| set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") |
| set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") |
| set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}") |
| -- |
| 2.14.3 |