From 41969109b57758051f168b9b6cbc3953e525dc42 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 2 Nov 2018 17:43:16 +0100 Subject: [PATCH] Replace OPENJPEG_INSTALL_DOC_DIR with CMAKE_INSTALL_DOCDIR This changes the default doc installdir to DATAROOTDIR/doc/PROJECT_NAME --- CMakeLists.txt | 10 ++-------- src/lib/openjp2/libopenjp2.pc.cmake.in | 2 +- src/lib/openjp3d/libopenjp3d.pc.cmake.in | 2 +- src/lib/openjpip/libopenjpip.pc.cmake.in | 2 +- src/lib/openjpwl/libopenjpwl.pc.cmake.in | 2 +- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f1804754..5459dac1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,12 +112,6 @@ 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(BUILD_DOC) -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 ${CMAKE_INSTALL_BINDIR}) @@ -323,10 +317,10 @@ 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}) + install(FILES CHANGES DESTINATION ${CMAKE_INSTALL_DOCDIR}) endif() -install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) +install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR}) endif() include (cmake/OpenJPEGCPack.cmake) diff --git a/src/lib/openjp2/libopenjp2.pc.cmake.in b/src/lib/openjp2/libopenjp2.pc.cmake.in index 559fdd72..ebad9578 100644 --- a/src/lib/openjp2/libopenjp2.pc.cmake.in +++ b/src/lib/openjp2/libopenjp2.pc.cmake.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ -docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ +docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ diff --git a/src/lib/openjp3d/libopenjp3d.pc.cmake.in b/src/lib/openjp3d/libopenjp3d.pc.cmake.in index 5e0bef04..866a0174 100644 --- a/src/lib/openjp3d/libopenjp3d.pc.cmake.in +++ b/src/lib/openjp3d/libopenjp3d.pc.cmake.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ -docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ +docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ diff --git a/src/lib/openjpip/libopenjpip.pc.cmake.in b/src/lib/openjpip/libopenjpip.pc.cmake.in index cafc9f97..4cfa6fce 100644 --- a/src/lib/openjpip/libopenjpip.pc.cmake.in +++ b/src/lib/openjpip/libopenjpip.pc.cmake.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ -docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ +docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ diff --git a/src/lib/openjpwl/libopenjpwl.pc.cmake.in b/src/lib/openjpwl/libopenjpwl.pc.cmake.in index bb5bd8f0..8acc1457 100644 --- a/src/lib/openjpwl/libopenjpwl.pc.cmake.in +++ b/src/lib/openjpwl/libopenjpwl.pc.cmake.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ -docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ +docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@