|
@@ -15,12 +15,12 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
|
|
|
|
|
--- a/cmake/modules/PopplerMacros.cmake
|
|
|
+++ b/cmake/modules/PopplerMacros.cmake
|
|
|
-@@ -123,14 +123,14 @@ if(CMAKE_COMPILER_IS_GNUCXX)
|
|
|
+@@ -104,14 +104,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 "-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 ${_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}")
|
|
@@ -32,16 +32,16 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
|
|
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}")
|
|
|
-@@ -167,7 +167,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL
|
|
|
+@@ -149,7 +149,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
|
|
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}")
|
|
|
# clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
|
|
|
-@@ -175,7 +175,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL
|
|
|
+@@ -157,7 +157,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
|
|
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}")
|
|
@@ -50,3 +50,6 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
|
|
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
|
|
|
set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
|
|
|
# clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
|
|
|
+--
|
|
|
+2.25.1
|
|
|
+
|