Skip to content

Commit

Permalink
Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes uclouvain#1174)
Browse files Browse the repository at this point in the history
This fixes the case where the cmake file is accessed via a symlink.
  • Loading branch information
matthew-sharp committed Dec 9, 2020
1 parent 5d0a8b0 commit 6558637
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions cmake/OpenJPEGConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 6558637

Please sign in to comment.