0001-This-patch-fixed-include-dir-to-usr-include-.-Obviou.patch 1.4 KB

123456789101112131415161718192021222324252627282930313233343536
  1. From 3e4fe4c42d4d63c36df966baea87da6fbc032553 Mon Sep 17 00:00:00 2001
  2. From: Lei Maohui <leimaohui@cn.fujitsu.com>
  3. Date: Thu, 7 Jan 2021 16:05:28 +0900
  4. Subject: [PATCH] This patch fixed include dir to /usr/include/. Obviously, it
  5. is not suitble for cross-compile. So, removed this patch temporarily.
  6. https://github.com/uclouvain/openjpeg/issues/1174
  7. Upsteam-Status: Pending
  8. https://github.com/uclouvain/openjpeg/issues/1320
  9. Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
  10. ---
  11. cmake/OpenJPEGConfig.cmake.in | 6 +++++-
  12. 1 file changed, 5 insertions(+), 1 deletion(-)
  13. diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in
  14. index 8a726697..2925108a 100644
  15. --- a/cmake/OpenJPEGConfig.cmake.in
  16. +++ b/cmake/OpenJPEGConfig.cmake.in
  17. @@ -27,8 +27,12 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
  18. # This is an install tree
  19. include(${SELF_DIR}/OpenJPEGTargets.cmake)
  20. + # We find a relative path from the PKG directory to header files.
  21. + set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@")
  22. set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
  23. - get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE)
  24. + file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
  25. +
  26. + get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
  27. else()
  28. if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
  29. --
  30. 2.25.1