Replace OPENJPEG_INSTALL_INCLUDE_DIR with CMAKE_INSTALL_INCLUDEDIR
CMAKE_INSTALL_FULL_INCLUDEDIR contains absolute path with CMAKE_INSTALL_PREFIX
This commit is contained in:
parent
7077d79342
commit
e51ca4227f
|
@ -112,10 +112,6 @@ option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF
|
||||||
string(TOLOWER ${PROJECT_NAME} projectname)
|
string(TOLOWER ${PROJECT_NAME} projectname)
|
||||||
set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
|
set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}")
|
||||||
|
|
||||||
if(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
|
|
||||||
set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(BUILD_DOC)
|
if(BUILD_DOC)
|
||||||
if(NOT OPENJPEG_INSTALL_MAN_DIR)
|
if(NOT OPENJPEG_INSTALL_MAN_DIR)
|
||||||
set(OPENJPEG_INSTALL_MAN_DIR "share/man/")
|
set(OPENJPEG_INSTALL_MAN_DIR "share/man/")
|
||||||
|
|
|
@ -27,7 +27,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
|
||||||
# This is an install tree
|
# This is an install tree
|
||||||
include(${SELF_DIR}/OpenJPEGTargets.cmake)
|
include(${SELF_DIR}/OpenJPEGTargets.cmake)
|
||||||
|
|
||||||
set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
|
set(INC_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@")
|
||||||
get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE)
|
get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE)
|
||||||
|
|
||||||
else()
|
else()
|
||||||
|
|
|
@ -2,7 +2,7 @@ include_regular_expression("^.*$")
|
||||||
|
|
||||||
#
|
#
|
||||||
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
|
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
|
||||||
DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers)
|
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers)
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
${${OPENJPEG_NAMESPACE}_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h
|
${${OPENJPEG_NAMESPACE}_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h
|
||||||
|
@ -121,7 +121,7 @@ install(TARGETS ${INSTALL_LIBS}
|
||||||
|
|
||||||
# Install includes files
|
# Install includes files
|
||||||
install(FILES openjpeg.h opj_stdint.h
|
install(FILES openjpeg.h opj_stdint.h
|
||||||
DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
|
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers
|
||||||
)
|
)
|
||||||
|
|
||||||
if(BUILD_DOC)
|
if(BUILD_DOC)
|
||||||
|
|
|
@ -3,7 +3,7 @@ bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
|
||||||
mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
|
mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
|
||||||
docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
|
docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
|
||||||
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||||
includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
|
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
|
||||||
|
|
||||||
Name: openjp2
|
Name: openjp2
|
||||||
Description: JPEG2000 library (Part 1 and 2)
|
Description: JPEG2000 library (Part 1 and 2)
|
||||||
|
|
|
@ -40,6 +40,6 @@ install(TARGETS ${OPENJP3D_LIBRARY_NAME}
|
||||||
|
|
||||||
# Install includes files
|
# Install includes files
|
||||||
install(FILES openjp3d.h
|
install(FILES openjp3d.h
|
||||||
DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}
|
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}
|
||||||
COMPONENT Headers
|
COMPONENT Headers
|
||||||
)
|
)
|
||||||
|
|
|
@ -3,7 +3,7 @@ bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
|
||||||
mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
|
mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
|
||||||
docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
|
docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
|
||||||
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||||
includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
|
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
|
||||||
|
|
||||||
Name: openjp3d
|
Name: openjp3d
|
||||||
Description: JPEG2000 Extensions for three-dimensional data (Part 10)
|
Description: JPEG2000 Extensions for three-dimensional data (Part 10)
|
||||||
|
|
|
@ -3,7 +3,7 @@ bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
|
||||||
mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
|
mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
|
||||||
docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
|
docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
|
||||||
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||||
includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
|
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
|
||||||
|
|
||||||
Name: openjpip
|
Name: openjpip
|
||||||
Description: JPEG2000 Interactivity tools, APIs and protocols (Part 9)
|
Description: JPEG2000 Interactivity tools, APIs and protocols (Part 9)
|
||||||
|
|
|
@ -3,7 +3,7 @@ bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
|
||||||
mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
|
mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
|
||||||
docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
|
docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
|
||||||
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||||
includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
|
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
|
||||||
|
|
||||||
Name: openjpwl
|
Name: openjpwl
|
||||||
Description: JPEG2000 Wireless library (Part 11)
|
Description: JPEG2000 Wireless library (Part 11)
|
||||||
|
|
|
@ -59,6 +59,6 @@ install(TARGETS ${OPENMJ2_LIBRARY_NAME}
|
||||||
|
|
||||||
# Install includes files
|
# Install includes files
|
||||||
#install(FILES mj2.h
|
#install(FILES mj2.h
|
||||||
# DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir}
|
# DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR}
|
||||||
# COMPONENT Headers
|
# COMPONENT Headers
|
||||||
#)
|
#)
|
||||||
|
|
Loading…
Reference in New Issue