diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-12-10 15:55:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-10 15:55:41 +0100 |
| commit | 98a4c5c3709e0cc43b0a1c151ed5bd85a2d607fa (patch) | |
| tree | b3ebe93b15ad9f967c8a5fb8c9513b2cdfed7e1c | |
| parent | 5d0a8b08dcd3bcdf532c54702b5a88ec61b17918 (diff) | |
| parent | 65586374d639cfc0104419992f9022174b412594 (diff) | |
Merge pull request #1306 from matthew-sharp/master
Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes uclouvain#1174)
| -rw-r--r-- | cmake/OpenJPEGConfig.cmake.in | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in index 2925108a..8a726697 100644 --- a/cmake/OpenJPEGConfig.cmake.in +++ b/cmake/OpenJPEGConfig.cmake.in @@ -27,12 +27,8 @@ 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@") - file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}") - - get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE) + get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE) else() if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake) |