1From b6fc6c36d359a50503138cd87d7147faf6dff893 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Sat, 17 Mar 2018 20:52:10 +0100
4Subject: [PATCH] Do not overwrite all our build flags
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Inappropriate [embedded specific]
10
11Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
12---
13 cmake/modules/PopplerMacros.cmake | 8 ++++----
14 1 file changed, 4 insertions(+), 4 deletions(-)
15
16diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
17index 2aed028..3c30f3f 100644
18--- a/cmake/modules/PopplerMacros.cmake
19+++ b/cmake/modules/PopplerMacros.cmake
20@@ -117,13 +117,13 @@ if(CMAKE_COMPILER_IS_GNUCXX)
21   set(DEFAULT_COMPILE_WARNINGS "${_warn}")
22   set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
23
24-  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
25+  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}")
26   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
27   set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG")
28   set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
29   set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
30   set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
31-  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
32+  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}")
33   set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
34   set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG")
35   set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
36@@ -161,14 +161,14 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
37   set(DEFAULT_COMPILE_WARNINGS "${_warn}")
38   set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
39
40-  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
41+  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}")
42   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
43   set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG")
44   # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
45   set(CMAKE_CXX_FLAGS_DEBUG          "-g")
46   set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
47   set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
48-  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
49+  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}")
50   set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
51   set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG")
52   # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
53--
542.25.1
55
56