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
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
From: "Gert Wollny" <gw.fossdev@gmail.com>
From: "Mathieu Malaterre" <malat@debian.org>
Date: Sat, 14 Sep 2024 10:59:43 +0200
Subject: Correct use of scripts from vtk7-doc
In vtk7-doc these scripts are installed uncompressed.
In addition the patch changes the vtk doxygen source directory and
incorporates an patch to link to the VTK doc and replace PNG by SVG,
Merged to one patch because they overlap partially.
---
Utilities/doxygen/vtk/CMakeLists.txt | 8 ++++----
Utilities/doxygen/vtk/doc_makeall.sh.in | 13 ++++++++-----
Utilities/doxygen/vtk/doxyfile.in | 1 +
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/Utilities/doxygen/vtk/CMakeLists.txt b/Utilities/doxygen/vtk/CMakeLists.txt
index 2173ea4..f70d1b8 100644
--- a/Utilities/doxygen/vtk/CMakeLists.txt
+++ b/Utilities/doxygen/vtk/CMakeLists.txt
@@ -22,7 +22,7 @@ mark_as_advanced(VTK_DIR)
set (QT_TAG_FILE "${CMAKE_CURRENT_BINARY_DIR}/Qt.tag")
endif ()
set(BUILD_DOXYGEN ON)
- set(DOCUMENTATION_DOWNLOAD_VTK_TAGFILE ON)
+ set(DOCUMENTATION_DOWNLOAD_VTK_TAGFILE OFF)
set(DOCUMENTATION_HTML_TARZ ON)
set(DOXYGEN_PROJECT_NAME "vtkgdcm")
if(VTK_SOURCE_DIR)
@@ -35,8 +35,8 @@ mark_as_advanced(VTK_DIR)
# sudo apt-get install vtk-doc
if(EXISTS "/usr/share/doc/vtk-doc/html")
set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk-doc/html")
- elseif(EXISTS "/usr/share/doc/vtk6-doc/doxygen")
- set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk6-doc/doxygen")
+ elseif(EXISTS "/usr/share/doc/vtk9/doxygen")
+ set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk9/doxygen")
else()
message(ERROR "DOXYGEN_SOURCE_DIR need to be set.")
endif()
@@ -97,7 +97,7 @@ mark_as_advanced(VTK_DIR)
get_filename_component(DOT_PATH ${DOT} PATH)
endif()
- set(TAGFILES "\"${CMAKE_CURRENT_BINARY_DIR}/vtkNightlyDoc.tag=http://www.vtk.org/doc/nightly/html\"")
+ #set(TAGFILES "\"${CMAKE_CURRENT_BINARY_DIR}/vtkNightlyDoc.tag=http://www.vtk.org/doc/nightly/html\"")
if(INCLUDE_QT_DOCUMENTATION)
set (TAGFILES "${TAGFILES} \"${QT_TAG_FILE}=http://doc.trolltech.com/4.2\"")
endif()
diff --git a/Utilities/doxygen/vtk/doc_makeall.sh.in b/Utilities/doxygen/vtk/doc_makeall.sh.in
index fc2d59f..df76fbc 100644
--- a/Utilities/doxygen/vtk/doc_makeall.sh.in
+++ b/Utilities/doxygen/vtk/doc_makeall.sh.in
@@ -42,7 +42,7 @@ export PROJECT_NAME=@DOXYGEN_PROJECT_NAME@
# Example:
# PATH_TO_VTK_DOX_SCRIPTS=@CMAKE_CURRENT_SOURCE_DIR@
#
-export PATH_TO_VTK_DOX_SCRIPTS="@DOXYGEN_SOURCE_DIR@"
+export PATH_TO_VTK_DOX_SCRIPTS=/usr/share/vtk9/doxygen/
export PATH_TO_VTKGDCM_FINAL_PATH="@VTKGDCM_FINAL_PATH@"
@@ -169,12 +169,12 @@ cd "${DOXTEMP}" || echoexit "Cannot find Doxygen output directory: ${DOXTEMP}"
# Convert the VTK headers to the Doxygen format.
echo "Convert the VTK headers to the Doxygen format."
if test "x$PERL_PROG" != "xNOTFOUND" ; then
- $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_header2doxygen.pl" \
+ $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_header2doxygen.pl" \
--to "$INTERMEDIATE_DOX_DIR" \
--relativeto "@DOXYGEN_SOURCE_LOCATIONS_DIR@" \
@DOXYGEN_SOURCE_LOCATIONS@ || echoexit "Problem converting VTK headers"
if test "x@DOXYGEN_BINARY_LOCATIONS_DIR@" != "x"; then
- $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_header2doxygen.pl" \
+ $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_header2doxygen.pl" \
--to "$INTERMEDIATE_DOX_DIR" \
--relativeto "@DOXYGEN_BINARY_LOCATIONS_DIR@" \
@DOXYGEN_BINARY_LOCATIONS@ || echoexit "Problem converting VTK headers"
@@ -186,13 +186,16 @@ echo "Convert the VTK headers to the Doxygen format - done"
# Build the full-text index.
echo "Build the full-text index."
if test "x$PERL_PROG" != "xNOTFOUND" ; then
+ cp "$PATH_TO_VTK_DOX_SCRIPTS/doc_index.stop" doc_index.stop
+
$PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_index.pl" \
--project "$PROJECT_NAME" \
- --stop "$PATH_TO_VTK_DOX_SCRIPTS/doc_index.stop" \
+ --stop "doc_index.stop" \
--store "doc_""$PROJECT_NAME""_index.dox" \
--to "$INTERMEDIATE_DOX_DIR" \
@DOXYGEN_SOURCE_LOCATIONS@ \
@DOXYGEN_BINARY_LOCATIONS@ || echoexit "Problem building full-text index"
+ rm -f doc_index.stop
fi
echo "Build the full-text index - done"
@@ -201,7 +204,7 @@ echo "Build the full-text index - done"
# # demos that use that class.
# if test "x$PERL_PROG" != "xNOTFOUND" ; then
-# $PERL_PROG $PATH_TO_VTK_DOX_SCRIPTS/doc_class2example.pl \
+# gzip -dc $PATH_TO_VTK_DOX_SCRIPTS/doc_class2example.pl | $PERL_PROG - \
# --datamatch "\W((VTK|ParaView)_DATA_ROOT|(VTK|MedVIP)Data|(vtk)?GetDataRoot|ExpandDataFileName)\W" \
# --dataicon "paper-clip.gif" \
# --dirmatch "^demos$" \
diff --git a/Utilities/doxygen/vtk/doxyfile.in b/Utilities/doxygen/vtk/doxyfile.in
index 20c47da..a4d308c 100644
--- a/Utilities/doxygen/vtk/doxyfile.in
+++ b/Utilities/doxygen/vtk/doxyfile.in
@@ -23,6 +23,7 @@ PDF_HYPERLINKS = YES
HAVE_DOT = YES
#HAVE_DOT = NO
DOT_PATH = "@DOT_PATH@"
+DOT_IMAGE_FORMAT = svg
CLASS_GRAPH = YES
COLLABORATION_GRAPH = YES
TEMPLATE_RELATIONS = YES
|
