Replace OPENJPEG_INSTALL_DOC_DIR with CMAKE_INSTALL_DOCDIR
This changes the default doc installdir to DATAROOTDIR/doc/PROJECT_NAME
This commit is contained in:
parent
0892057d7f
commit
bec97ed6a5
|
@ -113,12 +113,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(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(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})
|
||||||
|
@ -327,10 +321,10 @@ install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
|
||||||
# install CHANGES and LICENSE
|
# install CHANGES and LICENSE
|
||||||
if(BUILD_DOC)
|
if(BUILD_DOC)
|
||||||
if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
|
if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
|
||||||
install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
|
install(FILES CHANGES DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
|
install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include (cmake/OpenJPEGCPack.cmake)
|
include (cmake/OpenJPEGCPack.cmake)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
prefix=@CMAKE_INSTALL_PREFIX@
|
prefix=@CMAKE_INSTALL_PREFIX@
|
||||||
bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
|
bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
|
||||||
mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
|
mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
|
||||||
docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
|
docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
|
||||||
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||||
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
|
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
prefix=@CMAKE_INSTALL_PREFIX@
|
prefix=@CMAKE_INSTALL_PREFIX@
|
||||||
bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
|
bindir=${prefix}/@CMAKE_INSTALL_BINDIR@
|
||||||
mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
|
mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
|
||||||
docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
|
docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
|
||||||
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
|
||||||
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
|
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue