[1.5] Finish import of r963

2012-03-02 15:21:29 +00:00 · 2012-03-02 15:21:29 +00:00 · d1a1653f2a
parent 5a817eba3d
commit d1a1653f2a
2 changed files with 8 additions and 2 deletions
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@ -10,6 +10,11 @@ IF(DOXYGEN_FOUND)
  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)
--- 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