[1.5] Finish import of r963

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 0c00e31a115c0cf6833e3f07e7a612807497f7df..d30e384ef6052ed2aebda4c512922cdf9a66620e 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -9,7 +9,12 @@ IF(DOXYGEN_FOUND)
   # Configure the doxygen config file with variable from CMake and move it
   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.dox.cmake.in
     ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox @ONLY)
-  
+
+  # Configure the html mainpage file of the doxygen documentation with variable
+  # from CMake and move it  
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mainpage.dox.cmake
+    ${CMAKE_BINARY_DIR}/doc/mainpage.dox @ONLY)
+
   # Generate new target to build the html documentation
   ADD_CUSTOM_TARGET(doc ALL
     ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox)

diff --git a/doc/Doxyfile.dox.cmake.in b/doc/Doxyfile.dox.cmake.in
index 4b6f72dcffdbbd7ec07ed2370c9322ae78de915a..1bd970e88af5156836c4055c9749da095487e7ba 100644 (file)
--- a/doc/Doxyfile.dox.cmake.in
+++ b/doc/Doxyfile.dox.cmake.in
@@ -104,7 +104,8 @@ INPUT                  = @OPENJPEG_SOURCE_DIR@/libopenjpeg \
                          @OPENJPEG_BINARY_DIR@/doc
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.h \
-                         *.c
+                         *.c \
+                         *.dox
 RECURSIVE              = YES
 EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO