diff options
Diffstat (limited to 'poppler-0.84.0-MacroPushRequiredVars.patch')
| -rw-r--r-- | poppler-0.84.0-MacroPushRequiredVars.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/poppler-0.84.0-MacroPushRequiredVars.patch b/poppler-0.84.0-MacroPushRequiredVars.patch new file mode 100644 index 0000000..3d47d81 --- /dev/null +++ b/poppler-0.84.0-MacroPushRequiredVars.patch @@ -0,0 +1,66 @@ +From 25feab2736d35ca707bde173b4a7d548da342211 Mon Sep 17 00:00:00 2001 +From: Marek Kasik <mkasik@redhat.com> +Date: Thu, 2 Jan 2020 13:40:40 +0100 +Subject: [PATCH] Revert Remove unused MacroPushRequiredVars.cmake + +This is needed by the QT4 removal revert. +--- + cmake/modules/MacroPushRequiredVars.cmake | 46 +++++++++++++++++++++++ + 1 file changed, 46 insertions(+) + create mode 100644 cmake/modules/MacroPushRequiredVars.cmake + +diff --git a/cmake/modules/MacroPushRequiredVars.cmake b/cmake/modules/MacroPushRequiredVars.cmake +new file mode 100644 +index 00000000..35a6df5e +--- /dev/null ++++ b/cmake/modules/MacroPushRequiredVars.cmake +@@ -0,0 +1,46 @@ ++# this module defines two macros: ++# MACRO_PUSH_REQUIRED_VARS() ++# and ++# MACRO_POP_REQUIRED_VARS() ++# use these if you call cmake macros which use ++# any of the CMAKE_REQUIRED_XXX variables ++# ++# Usage: ++# MACRO_PUSH_REQUIRED_VARS() ++# SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -DSOME_MORE_DEF) ++# CHECK_FUNCTION_EXISTS(...) ++# MACRO_POP_REQUIRED_VARS() ++ ++# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org> ++# ++# Redistribution and use is allowed according to the terms of the BSD license. ++# For details see the accompanying COPYING-CMAKE-SCRIPTS file. ++ ++MACRO(MACRO_PUSH_REQUIRED_VARS) ++ ++ IF(NOT DEFINED _PUSH_REQUIRED_VARS_COUNTER) ++ SET(_PUSH_REQUIRED_VARS_COUNTER 0) ++ ENDIF(NOT DEFINED _PUSH_REQUIRED_VARS_COUNTER) ++ ++ MATH(EXPR _PUSH_REQUIRED_VARS_COUNTER "${_PUSH_REQUIRED_VARS_COUNTER}+1") ++ ++ SET(_CMAKE_REQUIRED_INCLUDES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} ${CMAKE_REQUIRED_INCLUDES}) ++ SET(_CMAKE_REQUIRED_DEFINITIONS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} ${CMAKE_REQUIRED_DEFINITIONS}) ++ SET(_CMAKE_REQUIRED_LIBRARIES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} ${CMAKE_REQUIRED_LIBRARIES}) ++ SET(_CMAKE_REQUIRED_FLAGS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} ${CMAKE_REQUIRED_FLAGS}) ++ENDMACRO(MACRO_PUSH_REQUIRED_VARS) ++ ++MACRO(MACRO_POP_REQUIRED_VARS) ++ ++# don't pop more than we pushed ++ IF("${_PUSH_REQUIRED_VARS_COUNTER}" GREATER "0") ++ ++ SET(CMAKE_REQUIRED_INCLUDES ${_CMAKE_REQUIRED_INCLUDES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}}) ++ SET(CMAKE_REQUIRED_DEFINITIONS ${_CMAKE_REQUIRED_DEFINITIONS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}}) ++ SET(CMAKE_REQUIRED_LIBRARIES ${_CMAKE_REQUIRED_LIBRARIES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}}) ++ SET(CMAKE_REQUIRED_FLAGS ${_CMAKE_REQUIRED_FLAGS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}}) ++ ++ MATH(EXPR _PUSH_REQUIRED_VARS_COUNTER "${_PUSH_REQUIRED_VARS_COUNTER}-1") ++ ENDIF("${_PUSH_REQUIRED_VARS_COUNTER}" GREATER "0") ++ ++ENDMACRO(MACRO_POP_REQUIRED_VARS) +-- +2.24.1 + |