1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85
|
From: =?utf-8?q?=22IOhannes_m_zm=C3=B6lnig_=28Debian/GNU=29=22?=
<umlaeute@debian.org>
Date: Tue, 23 Oct 2018 21:49:33 +0200
Subject: removed calls to HHC (only available on w32)
and install into tmp-directories (make 'clean' target easier)
Last-Updated: 2015-07-25
---
doc/CMakeLists.txt | 6 +++---
doc/Doxyfile.in | 6 +++---
doc/Doxyfile_Cmd | 5 ++---
3 files changed, 8 insertions(+), 9 deletions(-)
--- assimp.orig/doc/CMakeLists.txt
+++ assimp/doc/CMakeLists.txt
@@ -33,9 +33,9 @@
DESTINATION ${CMAKE_INSTALL_DOCDIR}
)
install(FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/AssimpDoc_Html/AnimationOverview.png
- ${CMAKE_CURRENT_SOURCE_DIR}/AssimpDoc_Html/AnimationOverview.svg
- ${CMAKE_CURRENT_SOURCE_DIR}/AssimpDoc_Html/dragonsplash.png
+ ${CMAKE_CURRENT_SOURCE_DIR}/architecture/AnimationOverview.png
+ ${CMAKE_CURRENT_SOURCE_DIR}/architecture/AnimationOverview.svg
+ ${CMAKE_CURRENT_SOURCE_DIR}/images/dragonsplash.png
DESTINATION ${CMAKE_INSTALL_DOCDIR}/${HTML_OUTPUT}
)
endif()
--- assimp.orig/doc/Doxyfile.in
+++ assimp/doc/Doxyfile.in
@@ -717,7 +717,8 @@
# against the file with absolute path, so to exclude all test directories
# for example use the pattern */test/*
-EXCLUDE_PATTERNS = */.git/*
+EXCLUDE_PATTERNS = */.git/* \
+ */*.o.d
# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
# (namespaces, classes, functions, etc.) that should be excluded from the
@@ -878,7 +879,7 @@
# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
# generate HTML output.
-GENERATE_HTML = NO
+GENERATE_HTML = YES
# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
@@ -1043,7 +1044,6 @@
# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
# the HTML help compiler on the generated index.hhp.
-HHC_LOCATION = "C:\Program Files (x86)\HTML Help Workshop/hhc.exe"
# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
# controls if a separate .chi index file is generated (YES) or that
--- assimp.orig/doc/Doxyfile_Cmd
+++ assimp/doc/Doxyfile_Cmd
@@ -58,7 +58,7 @@
# 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 = tmp
# 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
@@ -1075,7 +1075,7 @@
# The default directory is: html.
# This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_OUTPUT = AssimpCmdDoc_Html
+HTML_OUTPUT = assimp
# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
# generated HTML page (for example: .htm, .php, .asp).
@@ -1281,7 +1281,6 @@
# The file has to be specified with full path.
# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-HHC_LOCATION = "C:/Program Files (x86)/HTML Help Workshop/hhc.exe"
# The GENERATE_CHI flag controls if a separate .chi index file is generated (
# YES) or that it should be included in the master .chm file ( NO).
|