Replace OPENJPEG_INSTALL_LIB_DIR with CMAKE_INSTALL_LIBDIR
CMAKE_INSTALL_FULL_LIBDIR contains absolute path with CMAKE_INSTALL_PREFIX
This commit is contained in:
parent
b21e7c69f1
commit
94d0b9aca4
|
@ -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_LIB_DIR)
|
|
||||||
set(OPENJPEG_INSTALL_LIB_DIR "lib")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT OPENJPEG_INSTALL_SHARE_DIR)
|
if(NOT OPENJPEG_INSTALL_SHARE_DIR)
|
||||||
set(OPENJPEG_INSTALL_SHARE_DIR "share")
|
set(OPENJPEG_INSTALL_SHARE_DIR "share")
|
||||||
endif()
|
endif()
|
||||||
|
@ -142,7 +138,7 @@ if(NOT OPENJPEG_INSTALL_JNI_DIR)
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR})
|
set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR})
|
||||||
else()
|
else()
|
||||||
set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR})
|
set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_LIBDIR})
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -150,11 +146,11 @@ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
|
||||||
# We could install *.cmake files in share/ however those files contains
|
# We could install *.cmake files in share/ however those files contains
|
||||||
# hardcoded path to libraries on a multi-arch system (fedora/debian) those
|
# 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)
|
# 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 "${CMAKE_INSTALL_LIBDIR}/${OPENJPEG_INSTALL_SUBDIR}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}")
|
list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
|
||||||
option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
|
option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -364,14 +360,14 @@ if(BUILD_PKGCONFIG_FILES)
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
|
${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
|
||||||
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
|
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
|
||||||
${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
|
${CMAKE_INSTALL_LIBDIR}/pkgconfig )
|
||||||
#
|
#
|
||||||
if(BUILD_JPWL)
|
if(BUILD_JPWL)
|
||||||
# install in lib and not share (see multi-arch note above)
|
# install in lib and not share (see multi-arch note above)
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY)
|
${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY)
|
||||||
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION
|
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION
|
||||||
${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
|
${CMAKE_INSTALL_LIBDIR}/pkgconfig )
|
||||||
endif()
|
endif()
|
||||||
#
|
#
|
||||||
if(BUILD_JPIP)
|
if(BUILD_JPIP)
|
||||||
|
@ -379,7 +375,7 @@ if(BUILD_PKGCONFIG_FILES)
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
|
${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
|
||||||
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
|
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
|
||||||
${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
|
${CMAKE_INSTALL_LIBDIR}/pkgconfig )
|
||||||
endif()
|
endif()
|
||||||
#
|
#
|
||||||
if(BUILD_JP3D)
|
if(BUILD_JP3D)
|
||||||
|
@ -387,7 +383,7 @@ if(BUILD_PKGCONFIG_FILES)
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY)
|
${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY)
|
||||||
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION
|
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION
|
||||||
${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
|
${CMAKE_INSTALL_LIBDIR}/pkgconfig )
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
|
@ -115,8 +115,8 @@ endif()
|
||||||
install(TARGETS ${INSTALL_LIBS}
|
install(TARGETS ${INSTALL_LIBS}
|
||||||
EXPORT OpenJPEGTargets
|
EXPORT OpenJPEGTargets
|
||||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
|
||||||
LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
|
||||||
ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
|
||||||
)
|
)
|
||||||
|
|
||||||
# Install includes files
|
# Install includes files
|
||||||
|
|
|
@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
|
||||||
bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
|
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}/@OPENJPEG_INSTALL_LIB_DIR@
|
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||||
includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
|
includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
|
||||||
|
|
||||||
Name: openjp2
|
Name: openjp2
|
||||||
|
|
|
@ -34,7 +34,7 @@ endif()
|
||||||
# Install library
|
# Install library
|
||||||
install(TARGETS ${OPENJP3D_LIBRARY_NAME}
|
install(TARGETS ${OPENJP3D_LIBRARY_NAME}
|
||||||
EXPORT OpenJP3DTargets
|
EXPORT OpenJP3DTargets
|
||||||
DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
|
DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
COMPONENT Libraries
|
COMPONENT Libraries
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
|
||||||
bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
|
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}/@OPENJPEG_INSTALL_LIB_DIR@
|
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||||
includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
|
includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
|
||||||
|
|
||||||
Name: openjp3d
|
Name: openjp3d
|
||||||
|
|
|
@ -75,8 +75,8 @@ endif()
|
||||||
install(TARGETS openjpip
|
install(TARGETS openjpip
|
||||||
EXPORT OpenJPEGTargets
|
EXPORT OpenJPEGTargets
|
||||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
|
||||||
LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
|
||||||
ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
|
||||||
)
|
)
|
||||||
|
|
||||||
if(BUILD_JPIP_SERVER)
|
if(BUILD_JPIP_SERVER)
|
||||||
|
@ -86,6 +86,6 @@ if(BUILD_JPIP_SERVER)
|
||||||
PROPERTIES COMPILE_FLAGS "-DSERVER")
|
PROPERTIES COMPILE_FLAGS "-DSERVER")
|
||||||
install(TARGETS openjpip_server
|
install(TARGETS openjpip_server
|
||||||
EXPORT OpenJPEGTargets
|
EXPORT OpenJPEGTargets
|
||||||
DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
|
DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
|
||||||
bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
|
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}/@OPENJPEG_INSTALL_LIB_DIR@
|
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||||
includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
|
includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
|
||||||
|
|
||||||
Name: openjpip
|
Name: openjpip
|
||||||
|
|
|
@ -59,6 +59,6 @@ endif()
|
||||||
install(TARGETS openjpwl
|
install(TARGETS openjpwl
|
||||||
EXPORT OpenJPEGTargets
|
EXPORT OpenJPEGTargets
|
||||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications
|
||||||
LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
|
||||||
ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries
|
||||||
)
|
)
|
||||||
|
|
|
@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
|
||||||
bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
|
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}/@OPENJPEG_INSTALL_LIB_DIR@
|
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||||
includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
|
includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
|
||||||
|
|
||||||
Name: openjpwl
|
Name: openjpwl
|
||||||
|
|
|
@ -53,7 +53,7 @@ endif()
|
||||||
# Install library
|
# Install library
|
||||||
install(TARGETS ${OPENMJ2_LIBRARY_NAME}
|
install(TARGETS ${OPENMJ2_LIBRARY_NAME}
|
||||||
EXPORT OpenMJ2Targets
|
EXPORT OpenMJ2Targets
|
||||||
DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}
|
DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
COMPONENT Libraries
|
COMPONENT Libraries
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue