38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
|
From 14f4c27e7c91f745a1dda9991b5deea3cbef2072 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
Date: Thu, 7 Jan 2021 14:09:50 +0100
|
||
|
|
Subject: [PATCH] Revert "Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes
|
||
|
|
uclouvain#1174)"
|
||
|
|
|
||
|
|
This reverts commit 65586374d639cfc0104419992f9022174b412594 which
|
||
|
|
breaks cross-compilation of poppler under buildroot (because of
|
||
|
|
DESTDIR usage).
|
||
|
|
|
||
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
[Upstream status: https://github.com/uclouvain/openjpeg/pull/1321]
|
||
|
|
---
|
||
|
|
cmake/OpenJPEGConfig.cmake.in | 6 +++++-
|
||
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in
|
||
|
|
index 8a726697..2925108a 100644
|
||
|
|
--- a/cmake/OpenJPEGConfig.cmake.in
|
||
|
|
+++ b/cmake/OpenJPEGConfig.cmake.in
|
||
|
|
@@ -27,8 +27,12 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
|
||
|
|
# This is an install tree
|
||
|
|
include(${SELF_DIR}/OpenJPEGTargets.cmake)
|
||
|
|
|
||
|
|
+ # We find a relative path from the PKG directory to header files.
|
||
|
|
+ set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@")
|
||
|
|
set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
|
||
|
|
- get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE)
|
||
|
|
+ file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
|
||
|
|
+
|
||
|
|
+ get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
|
||
|
|
|
||
|
|
else()
|
||
|
|
if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
|
||
|
|
--
|
||
|
|
2.29.2
|
||
|
|
|