| From fe491c0919f5adc8d626cb98c5ec19d0b99dfe20 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| Date: Thu, 27 Sep 2018 23:45:04 +0200 |
| Subject: [PATCH] Ensure cmake files are installed at common location |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| * Otherwise recent poppler is not able to find them |
| * Include path needs adjustment with this change |
| |
| Upstream-Status: Inappropriate [Configuration] |
| |
| Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
| --- |
| CMakeLists.txt | 2 +- |
| cmake/OpenJPEGConfig.cmake.in | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/CMakeLists.txt b/CMakeLists.txt |
| index ff70a06f..23d2fac4 100644 |
| --- a/CMakeLists.txt |
| +++ b/CMakeLists.txt |
| @@ -150,7 +150,7 @@ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR) |
| # We could install *.cmake files in share/ however those files contains |
| # hardcoded path to libraries on a multi-arch system (fedora/debian) those |
| # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu) |
| - set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}") |
| + set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}") |
| endif() |
| |
| if (APPLE) |
| diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in |
| index b20294ca..6a2f4baf 100644 |
| --- a/cmake/OpenJPEGConfig.cmake.in |
| +++ b/cmake/OpenJPEGConfig.cmake.in |
| @@ -26,7 +26,7 @@ get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) |
| if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) |
| # This is an install tree |
| include(${SELF_DIR}/OpenJPEGTargets.cmake) |
| - get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) |
| + get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) |
| set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT}) |
| |
| else() |
| -- |
| 2.14.4 |
| |