Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From fe491c0919f5adc8d626cb98c5ec19d0b99dfe20 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| 3 | Date: Thu, 27 Sep 2018 23:45:04 +0200 |
| 4 | Subject: [PATCH] Ensure cmake files are installed at common location |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | * Otherwise recent poppler is not able to find them |
| 10 | * Include path needs adjustment with this change |
| 11 | |
| 12 | Upstream-Status: Inappropriate [Configuration] |
| 13 | |
| 14 | Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
| 15 | --- |
| 16 | CMakeLists.txt | 2 +- |
| 17 | cmake/OpenJPEGConfig.cmake.in | 2 +- |
| 18 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 19 | |
| 20 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 21 | index ff70a06f..23d2fac4 100644 |
| 22 | --- a/CMakeLists.txt |
| 23 | +++ b/CMakeLists.txt |
| 24 | @@ -150,7 +150,7 @@ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR) |
| 25 | # We could install *.cmake files in share/ however those files contains |
| 26 | # hardcoded path to libraries on a multi-arch system (fedora/debian) those |
| 27 | # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu) |
| 28 | - set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}") |
| 29 | + set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}") |
| 30 | endif() |
| 31 | |
| 32 | if (APPLE) |
| 33 | diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in |
| 34 | index b20294ca..6a2f4baf 100644 |
| 35 | --- a/cmake/OpenJPEGConfig.cmake.in |
| 36 | +++ b/cmake/OpenJPEGConfig.cmake.in |
| 37 | @@ -26,7 +26,7 @@ get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) |
| 38 | if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) |
| 39 | # This is an install tree |
| 40 | include(${SELF_DIR}/OpenJPEGTargets.cmake) |
| 41 | - get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) |
| 42 | + get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) |
| 43 | set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT}) |
| 44 | |
| 45 | else() |
| 46 | -- |
| 47 | 2.14.4 |
| 48 | |