From f6d3a678bca5cbeea83267f8e8f83e7c87412337 Mon Sep 17 00:00:00 2001
From: Francois Bleibel <fbleibel@gmail.com>
Date: Wed, 27 Oct 2010 16:46:58 +0900
Subject: [PATCH] Modified documentation output dir.
---
doc/CMakeLists.txt | 34 +++++++++++++++++++++-------------
doc/package.dox.cmake | 2 +-
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index b3a252d3..64490d3f 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -44,27 +44,35 @@ ENDMACRO(MANPAGE)
SET(BUILD_DIR ${CMAKE_BINARY_DIR}/doc)
SET(DOCDIR share/doc/${PROJECT_NAME})
-SET(HTMLDIR ${DOCDIR}/html)
-
-# Add `doc' target.
-ADD_CUSTOM_TARGET(
- doc ALL
- DEPENDS html/index.html dg-shell.1.gz dg-shell-plugin.1.gz)
-
+SET(HTMLDIR ${DOCDIR}/doxygen-html)
# Generate Doxygen configuration file.
CONFIGURE_FILE(package.dox.cmake ${BUILD_DIR}/package.dox)
-# Generating the Doxygen documentation
+
+# Teach CMake how to generate the documentation.
+ADD_CUSTOM_TARGET(doc
+ COMMAND ${DOXYGEN_EXECUTABLE} package.dox
+ WORKING_DIRECTORY doc
+)
+
ADD_CUSTOM_COMMAND(
- OUTPUT ${BUILD_DIR}/html/index.html
- COMMAND ${DOXYGEN_EXECUTABLE} package.dox
- COMMENT Generating Doxygen documentation
+ OUTPUT
+ ${BUILD_DIR}/${PROJECT_NAME}.doxytag
+ ${BUILD_DIR}/doxygen-html
+ COMMAND ${DOXYGEN_EXECUTABLE} package.dox
+ WORKING_DIRECTORY doc
+ COMMENT "Generating Doxygen documentation"
)
# Doxygen documentation installation rules.
-INSTALL(DIRECTORY ${BUILD_DIR}/html DESTINATION ${DOCDIR})
-INSTALL(FILES ${BUILD_DIR}/${PROJECT_NAME}.doxytag DESTINATION ${HTMLDIR})
+ # Install generated files.
+INSTALL(
+ CODE "EXECUTE_PROCESS(COMMAND make doc)"
+ FILES ${BUILD_DIR}/${PROJECT_NAME}.doxytag
+ DESTINATION share/doc/${PROJECT_NAME}/doxygen-html)
+INSTALL(DIRECTORY ${BUILD_DIR}/doxygen-html
+ DESTINATION share/doc/${PROJECT_NAME})
INSTALL(DIRECTORY pictures DESTINATION ${HTMLDIR})
diff --git a/doc/package.dox.cmake b/doc/package.dox.cmake
index 4b2a4881..087efe98 100644
--- a/doc/package.dox.cmake
+++ b/doc/package.dox.cmake
@@ -785,7 +785,7 @@ GENERATE_HTML = YES
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `html' will be used as the default path.
-HTML_OUTPUT = html
+HTML_OUTPUT = doxygen-html
# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
--
GitLab