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 | 8 ++++----
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
|
index 2aed028..3c30f3f 100644
|
--- a/cmake/modules/PopplerMacros.cmake
|
+++ b/cmake/modules/PopplerMacros.cmake
|
@@ -117,13 +117,13 @@ if(CMAKE_COMPILER_IS_GNUCXX)
|
set(DEFAULT_COMPILE_WARNINGS "${_warn}")
|
set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
|
|
- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
|
+ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}")
|
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
|
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
|
set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
|
set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
|
set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
|
- 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")
|
set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
|
set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
|
@@ -161,14 +161,14 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
set(DEFAULT_COMPILE_WARNINGS "${_warn}")
|
set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
|
|
- 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")
|
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
|
# clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
|
set(CMAKE_CXX_FLAGS_DEBUG "-g")
|
set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
|
set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
|
- 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")
|
set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
|
# clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
|
--
|
2.25.1
|
