install man pages by default. install CHANGES and LICENSE

diff --git a/CHANGES b/CHANGES
index 8a22d16b0c4857c3e9043d604ba0efcb123cb6be..7e3c2dbeea32827d5b08c6e275c52ec409ec215b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ What's New for OpenJPEG
 + : added
 
 November 17, 2010
+! [antonin] install man pages by default. install CHANGES and LICENSE
 ! [antonin] minor changes in cmake files (from winfried)
 
 November 16, 2010

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82a79ea070bb1558435e0e6b28dc250a6de6cc53..9c6cc2e557bf2ca16224257bc537b55ebb959777 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,6 +227,11 @@ CONFIGURE_FILE( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in
 INSTALL( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
   DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
 )
+# install CHANGES and LICENSE
+INSTALL(
+  FILES       CHANGES 
+              LICENSE
+  DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
 #
 IF(UNIX OR CYGWIN)
   SET(CMAKE_INCLUDE_PATH /usr/include /usr/local/include /opt/include 

diff --git a/codec/CMakeLists.txt b/codec/CMakeLists.txt
index e24ac470bcc6cb521a5448040378c724a316b019..4a9d63df4fd4902c423eb9832a843f792dcaf579 100644 (file)
--- a/codec/CMakeLists.txt
+++ b/codec/CMakeLists.txt
@@ -56,6 +56,14 @@ FOREACH(exe j2k_to_image image_to_j2k j2k_dump)
   )
 ENDFOREACH(exe)
 
+# Install man pages
+INSTALL(
+  FILES       ../doc/man/man1/image_to_j2k.1
+              ../doc/man/man1/j2k_dump.1
+              ../doc/man/man1/j2k_to_image.1
+  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
+#
+
 if(BUILD_TESTING)
 # Do testing here, once we know the examples are being built:
 FILE(GLOB_RECURSE OPENJPEG_DATA_IMAGES_GLOB

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index e60586e904647188e0cff7eae2e5a18e3fffc427..aadbadbae5c33c3eb3e3bb7ecb7f9f3406e540eb 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -13,11 +13,3 @@ ADD_CUSTOM_TARGET(doxygen
 )
 ENDIF(DOXYGEN_EXECUTABLE)
 
-INSTALL(
-  FILES       man/man1/image_to_j2k.1
-              man/man1/j2k_dump.1
-              man/man1/j2k_to_image.1
-  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
-INSTALL(
-  FILES       man/man3/libopenjpeg.3
-  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3)

diff --git a/libopenjpeg/CMakeLists.txt b/libopenjpeg/CMakeLists.txt
index 647eda7c736d582e0057e78a508ddbc84845b400..96192b7b9956e27669f68f41ea2dbbc5ef61248b 100644 (file)
--- a/libopenjpeg/CMakeLists.txt
+++ b/libopenjpeg/CMakeLists.txt
@@ -52,3 +52,8 @@ INSTALL(FILES openjpeg.h
 )
 INSTALL(CODE
   "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir}/openjpeg.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg.h)")
+
+# install man page of the library
+INSTALL(
+  FILES       ../doc/man/man3/libopenjpeg.3
+  DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3)