From ef58e4bf1e89bb88381263c85ea4f55d9aae7efc Mon Sep 17 00:00:00 2001 From: Michael Mair-Keimberger Date: Wed, 21 Aug 2019 20:24:49 +0200 Subject: media-libs/openjpeg: remove unused patches Signed-off-by: Michael Mair-Keimberger Closes: https://github.com/gentoo/gentoo/pull/12761 Signed-off-by: David Seifert --- .../openjpeg-2.3.0-fix-disable-static-libs.patch | 23 - .../files/openjpeg-2.3.0-gnuinstalldirs.patch | 501 --------------------- 2 files changed, 524 deletions(-) delete mode 100644 media-libs/openjpeg/files/openjpeg-2.3.0-fix-disable-static-libs.patch delete mode 100644 media-libs/openjpeg/files/openjpeg-2.3.0-gnuinstalldirs.patch diff --git a/media-libs/openjpeg/files/openjpeg-2.3.0-fix-disable-static-libs.patch b/media-libs/openjpeg/files/openjpeg-2.3.0-fix-disable-static-libs.patch deleted file mode 100644 index 9e30f4694f3e..000000000000 --- a/media-libs/openjpeg/files/openjpeg-2.3.0-fix-disable-static-libs.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 66297f07a43d2770a97c8456d20202f3d051d980 Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Mon, 9 Oct 2017 11:40:43 +0200 -Subject: [PATCH] Unix build: fix regression of 2.3.0 where a shared-only or - static-only build lacks the installation target for the library (#1019, fixes - regression introduced by 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b) - ---- - src/lib/openjp2/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt -index 0b4520384..f8990ccf0 100644 ---- a/src/lib/openjp2/CMakeLists.txt -+++ b/src/lib/openjp2/CMakeLists.txt -@@ -99,6 +99,7 @@ else() - set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static) - else() - add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) -+ set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME}) - endif() - endif() - diff --git a/media-libs/openjpeg/files/openjpeg-2.3.0-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.3.0-gnuinstalldirs.patch deleted file mode 100644 index 41942e451556..000000000000 --- a/media-libs/openjpeg/files/openjpeg-2.3.0-gnuinstalldirs.patch +++ /dev/null @@ -1,501 +0,0 @@ -From: Andreas Sturmlechner -Date: Fri, 2 Nov 2018 17:23:49 +0100 -Subject: Use GNUInstallDirs for standard installation directories - -Raises minimum cmake version by a little. - - -commit 24fd3ce777a64b8b315cfe1ee642ec7b1cc6aa97 -Author: Libor Bukata -Date: Fri Aug 31 12:57:40 2018 +0200 - - The change makes a relative path to header files - always correct regardless of the number of sub- - directories in OPENJPEG_INSTALL_PACKAGE_DIR variable. - -diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in -index b20294ca..2925108a 100644 ---- a/cmake/OpenJPEGConfig.cmake.in -+++ b/cmake/OpenJPEGConfig.cmake.in -@@ -26,8 +26,13 @@ get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) - if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) - # This is an install tree - include(${SELF_DIR}/OpenJPEGTargets.cmake) -- get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) -- set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT}) -+ -+ # 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) - - else() - if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cb545666..2ff3b00a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,7 +7,7 @@ - # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like - # e.g.: - # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG") --cmake_minimum_required(VERSION 2.8.2) -+cmake_minimum_required(VERSION 2.8.5) - - if(COMMAND CMAKE_POLICY) - cmake_policy(SET CMP0003 NEW) -@@ -102,59 +102,28 @@ endif() - - # -------------------------------------------------------------------------- - # Install directories -+include(GNUInstallDirs) -+ - # Build DOCUMENTATION (not in ALL target and only if Doxygen is found) - option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF) - - string(TOLOWER ${PROJECT_NAME} projectname) - set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}") - --if(NOT OPENJPEG_INSTALL_BIN_DIR) -- set(OPENJPEG_INSTALL_BIN_DIR "bin") --endif() -- --if(NOT OPENJPEG_INSTALL_LIB_DIR) -- set(OPENJPEG_INSTALL_LIB_DIR "lib") --endif() -- --if(NOT OPENJPEG_INSTALL_SHARE_DIR) -- set(OPENJPEG_INSTALL_SHARE_DIR "share") --endif() -- --if(NOT OPENJPEG_INSTALL_DATA_DIR) -- set(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}") --endif() -- --if(NOT OPENJPEG_INSTALL_INCLUDE_DIR) -- set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}") --endif() -- --if(BUILD_DOC) --if(NOT OPENJPEG_INSTALL_MAN_DIR) -- set(OPENJPEG_INSTALL_MAN_DIR "share/man/") --endif() -- --if(NOT OPENJPEG_INSTALL_DOC_DIR) -- set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}") --endif() --endif() -- - if(NOT OPENJPEG_INSTALL_JNI_DIR) - if(WIN32) -- set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR}) -+ set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR}) - else() -- set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR}) -+ set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_LIBDIR}) - endif() - endif() - - if(NOT OPENJPEG_INSTALL_PACKAGE_DIR) -- # We could install *.cmake files in share/ however those files contains -- # 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) -- set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}") -+ set(OPENJPEG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}") - endif() - - 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) - endif() - -@@ -338,14 +307,6 @@ install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake - ) - - #----------------------------------------------------------------------------- --# install CHANGES and LICENSE --if(BUILD_DOC) --if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES) -- install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) --endif() -- --install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) --endif() - - include (cmake/OpenJPEGCPack.cmake) - -@@ -362,14 +323,14 @@ if(BUILD_PKGCONFIG_FILES) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION -- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) -+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) - # - if(BUILD_JPWL) - # install in lib and not share (see multi-arch note above) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION -- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) -+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) - endif() - # - if(BUILD_JPIP) -@@ -377,7 +338,7 @@ if(BUILD_PKGCONFIG_FILES) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION -- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) -+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) - endif() - # - if(BUILD_JP3D) -@@ -385,7 +346,7 @@ if(BUILD_PKGCONFIG_FILES) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION -- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) -+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) - endif() - endif() - -diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in -index 2925108a..702e2790 100644 ---- a/cmake/OpenJPEGConfig.cmake.in -+++ b/cmake/OpenJPEGConfig.cmake.in -@@ -29,7 +29,7 @@ if(EXISTS ${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@") -+ set(INC_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@") - file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}") - - get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE) -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index d4f3ddbe..ed5cb44c 100644 ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -44,7 +44,7 @@ if(DOXYGEN_FOUND) - - # install HTML documentation (install png files too): - install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html -- DESTINATION share/doc -+ DESTINATION ${CMAKE_INSTALL_DOCDIR} - PATTERN ".svn" EXCLUDE - ) - else() -diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt -index 4d4bd952..29b4dd20 100644 ---- a/src/bin/jp2/CMakeLists.txt -+++ b/src/bin/jp2/CMakeLists.txt -@@ -67,7 +67,7 @@ foreach(exe opj_decompress opj_compress opj_dump) - # Install exe - install(TARGETS ${exe} - EXPORT OpenJPEGTargets -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications - ) - if(OPJ_USE_DSYMUTIL) - add_custom_command(TARGET ${exe} POST_BUILD -@@ -83,6 +83,6 @@ install( - FILES ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1 - ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_decompress.1 - ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1 -- DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1) -+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) - # - endif() -diff --git a/src/bin/jp3d/CMakeLists.txt b/src/bin/jp3d/CMakeLists.txt -index 3cac1a8f..ed62b4f3 100644 ---- a/src/bin/jp3d/CMakeLists.txt -+++ b/src/bin/jp3d/CMakeLists.txt -@@ -36,6 +36,6 @@ foreach(exe opj_jp3d_compress opj_jp3d_decompress) - # Install exe - install(TARGETS ${exe} - EXPORT OpenJP3DTargets -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications - ) - endforeach() -diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt -index 301d885b..ddd867dc 100644 ---- a/src/bin/jpip/CMakeLists.txt -+++ b/src/bin/jpip/CMakeLists.txt -@@ -13,7 +13,7 @@ add_executable(opj_jpip_addxml opj_jpip_addxml.c) - # Install exe - install(TARGETS opj_jpip_addxml - EXPORT OpenJPEGTargets -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications - ) - - if(BUILD_JPIP_SERVER) -@@ -38,7 +38,7 @@ if(BUILD_JPIP_SERVER) - # Install exe - install(TARGETS opj_server - EXPORT OpenJPEGTargets -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications - ) - endif() - -@@ -52,7 +52,7 @@ add_executable(${exe} ${exe}.c) - target_link_libraries(${exe} openjpip) - install(TARGETS ${exe} - EXPORT OpenJPEGTargets -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications - ) - endforeach() - -@@ -123,7 +123,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE) - ) - - install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar -- DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule -+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule - ) - else() - # opj_viewer (simple, no xerces) -@@ -153,7 +153,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE) - ) - - install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar -- DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule -+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule - ) - endif() - else() -diff --git a/src/bin/jpwl/CMakeLists.txt b/src/bin/jpwl/CMakeLists.txt -index 5df225de..8a798e61 100644 ---- a/src/bin/jpwl/CMakeLists.txt -+++ b/src/bin/jpwl/CMakeLists.txt -@@ -57,6 +57,6 @@ foreach(exe decompress compress) - endif() - - install(TARGETS ${jpwl_exe} -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications - ) - endforeach() -diff --git a/src/bin/mj2/CMakeLists.txt b/src/bin/mj2/CMakeLists.txt -index 5d3e288b..6669c502 100644 ---- a/src/bin/mj2/CMakeLists.txt -+++ b/src/bin/mj2/CMakeLists.txt -@@ -43,5 +43,5 @@ foreach(exe - endif() - - install(TARGETS ${exe} -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR}) -+ DESTINATION ${CMAKE_INSTALL_BINDIR}) - endforeach() -diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt -index b2714858..9cbc4c3f 100644 ---- a/src/lib/openjp2/CMakeLists.txt -+++ b/src/lib/openjp2/CMakeLists.txt -@@ -2,7 +2,7 @@ include_regular_expression("^.*$") - - # - 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( - ${${OPENJPEG_NAMESPACE}_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h -@@ -114,21 +114,21 @@ endif() - # Install library - install(TARGETS ${INSTALL_LIBS} - EXPORT OpenJPEGTargets -- RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -- LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -- ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries - ) - - # Install includes files - 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) - # install man page of the library - install( - FILES ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjp2.3 -- DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3) -+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man3) - endif() - - if(BUILD_LUTS_GENERATOR) -diff --git a/src/lib/openjp2/libopenjp2.pc.cmake.in b/src/lib/openjp2/libopenjp2.pc.cmake.in -index 62159b00..ebad9578 100644 ---- a/src/lib/openjp2/libopenjp2.pc.cmake.in -+++ b/src/lib/openjp2/libopenjp2.pc.cmake.in -@@ -1,9 +1,9 @@ - prefix=@CMAKE_INSTALL_PREFIX@ --bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ --mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ --docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ --libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ --includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ -+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ -+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ -+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ -+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ - - Name: openjp2 - Description: JPEG2000 library (Part 1 and 2) -diff --git a/src/lib/openjp3d/CMakeLists.txt b/src/lib/openjp3d/CMakeLists.txt -index b0469af1..6e251984 100644 ---- a/src/lib/openjp3d/CMakeLists.txt -+++ b/src/lib/openjp3d/CMakeLists.txt -@@ -34,12 +34,12 @@ endif() - # Install library - install(TARGETS ${OPENJP3D_LIBRARY_NAME} - EXPORT OpenJP3DTargets -- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT Libraries - ) - - # Install includes files - install(FILES openjp3d.h -- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} - COMPONENT Headers - ) -diff --git a/src/lib/openjp3d/libopenjp3d.pc.cmake.in b/src/lib/openjp3d/libopenjp3d.pc.cmake.in -index e9b6c404..866a0174 100644 ---- a/src/lib/openjp3d/libopenjp3d.pc.cmake.in -+++ b/src/lib/openjp3d/libopenjp3d.pc.cmake.in -@@ -1,9 +1,9 @@ - prefix=@CMAKE_INSTALL_PREFIX@ --bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ --mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ --docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ --libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ --includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ -+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ -+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ -+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ -+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ - - Name: openjp3d - Description: JPEG2000 Extensions for three-dimensional data (Part 10) -diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt -index b3cb8ce8..aace36d4 100644 ---- a/src/lib/openjpip/CMakeLists.txt -+++ b/src/lib/openjpip/CMakeLists.txt -@@ -74,9 +74,9 @@ endif() - # Install library - install(TARGETS openjpip - EXPORT OpenJPEGTargets -- RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -- LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -- ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries - ) - - if(BUILD_JPIP_SERVER) -@@ -86,6 +86,6 @@ if(BUILD_JPIP_SERVER) - PROPERTIES COMPILE_FLAGS "-DSERVER") - install(TARGETS openjpip_server - EXPORT OpenJPEGTargets -- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -+ DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries - ) - endif() -diff --git a/src/lib/openjpip/libopenjpip.pc.cmake.in b/src/lib/openjpip/libopenjpip.pc.cmake.in -index 7c3f29af..4cfa6fce 100644 ---- a/src/lib/openjpip/libopenjpip.pc.cmake.in -+++ b/src/lib/openjpip/libopenjpip.pc.cmake.in -@@ -1,9 +1,9 @@ - prefix=@CMAKE_INSTALL_PREFIX@ --bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ --mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ --docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ --libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ --includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ -+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ -+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ -+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ -+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ - - Name: openjpip - Description: JPEG2000 Interactivity tools, APIs and protocols (Part 9) -diff --git a/src/lib/openjpwl/CMakeLists.txt b/src/lib/openjpwl/CMakeLists.txt -index 1b33adbe..bb90c87c 100644 ---- a/src/lib/openjpwl/CMakeLists.txt -+++ b/src/lib/openjpwl/CMakeLists.txt -@@ -58,7 +58,7 @@ endif() - # Install library - install(TARGETS openjpwl - EXPORT OpenJPEGTargets -- RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -- LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -- ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries - ) -diff --git a/src/lib/openjpwl/libopenjpwl.pc.cmake.in b/src/lib/openjpwl/libopenjpwl.pc.cmake.in -index b1244197..8acc1457 100644 ---- a/src/lib/openjpwl/libopenjpwl.pc.cmake.in -+++ b/src/lib/openjpwl/libopenjpwl.pc.cmake.in -@@ -1,9 +1,9 @@ - prefix=@CMAKE_INSTALL_PREFIX@ --bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ --mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ --docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ --libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ --includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ -+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ -+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ -+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ -+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ - - Name: openjpwl - Description: JPEG2000 Wireless library (Part 11) -diff --git a/src/lib/openmj2/CMakeLists.txt b/src/lib/openmj2/CMakeLists.txt -index 25294b20..dced53f6 100644 ---- a/src/lib/openmj2/CMakeLists.txt -+++ b/src/lib/openmj2/CMakeLists.txt -@@ -53,12 +53,12 @@ endif() - # Install library - install(TARGETS ${OPENMJ2_LIBRARY_NAME} - EXPORT OpenMJ2Targets -- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT Libraries - ) - - # Install includes files - #install(FILES mj2.h --# DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir} -+# DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} - # COMPONENT Headers - #) -diff --git a/wrapping/java/openjp2/CMakeLists.txt b/wrapping/java/openjp2/CMakeLists.txt -index eb3da0ed..4504da5f 100644 ---- a/wrapping/java/openjp2/CMakeLists.txt -+++ b/wrapping/java/openjp2/CMakeLists.txt -@@ -69,5 +69,5 @@ add_custom_target(OpenJPEGJavaJar ALL - ) - - install(FILES ${LIBRARY_OUTPUT_PATH}/openjpeg.jar -- DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule -+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule - ) -- cgit v1.2.3-65-gdbad