1*4882a593SmuzhiyunFrom 14f4c27e7c91f745a1dda9991b5deea3cbef2072 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Thu, 7 Jan 2021 14:09:50 +0100 4*4882a593SmuzhiyunSubject: [PATCH] Revert "Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes 5*4882a593Smuzhiyun uclouvain#1174)" 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunThis reverts commit 65586374d639cfc0104419992f9022174b412594 which 8*4882a593Smuzhiyunbreaks cross-compilation of poppler under buildroot (because of 9*4882a593SmuzhiyunDESTDIR usage). 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 12*4882a593Smuzhiyun[Upstream status: https://github.com/uclouvain/openjpeg/pull/1321] 13*4882a593Smuzhiyun--- 14*4882a593Smuzhiyun cmake/OpenJPEGConfig.cmake.in | 6 +++++- 15*4882a593Smuzhiyun 1 file changed, 5 insertions(+), 1 deletion(-) 16*4882a593Smuzhiyun 17*4882a593Smuzhiyundiff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in 18*4882a593Smuzhiyunindex 8a726697..2925108a 100644 19*4882a593Smuzhiyun--- a/cmake/OpenJPEGConfig.cmake.in 20*4882a593Smuzhiyun+++ b/cmake/OpenJPEGConfig.cmake.in 21*4882a593Smuzhiyun@@ -27,8 +27,12 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) 22*4882a593Smuzhiyun # This is an install tree 23*4882a593Smuzhiyun include(${SELF_DIR}/OpenJPEGTargets.cmake) 24*4882a593Smuzhiyun 25*4882a593Smuzhiyun+ # We find a relative path from the PKG directory to header files. 26*4882a593Smuzhiyun+ set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@") 27*4882a593Smuzhiyun set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@") 28*4882a593Smuzhiyun- get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE) 29*4882a593Smuzhiyun+ file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}") 30*4882a593Smuzhiyun+ 31*4882a593Smuzhiyun+ get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE) 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun else() 34*4882a593Smuzhiyun if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake) 35*4882a593Smuzhiyun-- 36*4882a593Smuzhiyun2.29.2 37*4882a593Smuzhiyun 38