[arrayfire] 03/61: Build and install documentation in a separate output folder.

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Tue Dec 8 11:54:54 UTC 2015


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch dfsg-clean
in repository arrayfire.

commit 86dd6c71ac0fdcce41d36ef9308e52bb071f0554
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Nov 18 11:19:31 2015 +0000

    Build and install documentation in a separate output folder.
---
 docs/CMakeLists.txt | 9 +++------
 docs/doxygen.mk     | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index ec7f384..fbc02e1 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -21,18 +21,15 @@ CONFIGURE_FILE(${AF_DOCS_LAYOUT} ${AF_DOCS_LAYOUT_OUT})
 ADD_CUSTOM_TARGET(docs
     ALL
     COMMAND ${DOXYGEN_EXECUTABLE} ${AF_DOCS_CONFIG_OUT}
-    COMMAND cmake -E copy_directory ${ASSETS_DIR} ${CMAKE_CURRENT_BINARY_DIR}
-    COMMAND cmake -E remove ${CMAKE_CURRENT_BINARY_DIR}/.git
+    COMMAND cmake -E copy_directory ${ASSETS_DIR} ${CMAKE_CURRENT_BINARY_DIR}/html
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Generating Documentation"
     VERBATIM)
 
 # Install Doxygen documentation
-INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ DESTINATION ${AF_INSTALL_DOC_DIR}
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${AF_INSTALL_DOC_DIR}
     COMPONENT documentation
-    PATTERN "*"
-    PATTERN "CMakeFiles" EXCLUDE
-    PATTERN "man" EXCLUDE
+    PATTERN ".git" EXCLUDE
 )
 
 # Install man pages
diff --git a/docs/doxygen.mk b/docs/doxygen.mk
index defb7fe..46a1dc0 100644
--- a/docs/doxygen.mk
+++ b/docs/doxygen.mk
@@ -58,7 +58,7 @@ PROJECT_LOGO           = ${ASSETS_DIR}/arrayfire_logo.png
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = .
+OUTPUT_DIRECTORY       = ${CMAKE_CURRENT_BINARY_DIR}
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -1039,7 +1039,7 @@ GENERATE_HTML          = YES
 # The default directory is: html.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_OUTPUT            = .
+HTML_OUTPUT            = html
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
 # generated HTML page (for example: .htm, .php, .asp).

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git



More information about the debian-science-commits mailing list