Skip to content

Commit 95aca48

Browse files
committed
Fix some bugs in UseDoxygen.cmake
There was a bug in the definition of `DOXYFILE_LATEX`, and _another_ in the processing of it (which were the only reason it wasn't defaulting on, the way it appeared to be configured), fixed the bug and changed it to default OFF. But now it _can_ be enabled. Also moved the handling of `DOXYFILE_DOT` out of the latex-only section, so that it can be turned on with the new config variable `DOXYFILE_USE_DOT` (default on). If `DOXYFILE_USE_DOT` is enabled and the `dot` executable is found, `DOXYFILE_DOT` will be set "YES" and `dot` will be used for the HTML as well, giving better graphs.
1 parent 55f26a2 commit 95aca48

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

cmake/Modules/UseDoxygen.cmake

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,18 @@ if(DOXYGEN_FOUND AND DOXYFILE_IN_FOUND)
105105
STRING "Additional source files/directories separated by space")
106106
set(DOXYFILE_SOURE_DIRS "\"${DOXYFILE_SOURCE_DIR}\" ${DOXYFILE_EXTRA_SOURCES}")
107107

108-
usedoxygen_set_default(DOXYFILE_LATEX YES BOOL "Generate LaTeX API documentation" OFF)
108+
usedoxygen_set_default(DOXYFILE_LATEX OFF BOOL "Generate LaTeX API documentation")
109109
usedoxygen_set_default(DOXYFILE_LATEX_DIR "latex" STRING "LaTex output directory")
110110

111111
mark_as_advanced(DOXYFILE_OUTPUT_DIR DOXYFILE_HTML_DIR DOXYFILE_LATEX_DIR
112112
DOXYFILE_SOURCE_DIR DOXYFILE_EXTRA_SOURCE_DIRS DOXYFILE_IN)
113113

114+
## Dot
115+
usedoxygen_set_default(DOXYFILE_USE_DOT ON BOOL "Use dot (part of graphviz) to generate graphs")
116+
set(DOXYFILE_DOT "NO")
117+
if(DOXYFILE_USE_DOT AND DOXYGEN_DOT_EXECUTABLE)
118+
set(DOXYFILE_DOT "YES")
119+
endif()
114120

115121
set_property(DIRECTORY
116122
APPEND PROPERTY
@@ -125,13 +131,12 @@ if(DOXYGEN_FOUND AND DOXYFILE_IN_FOUND)
125131

126132
## LaTeX
127133
set(DOXYFILE_PDFLATEX "NO")
128-
set(DOXYFILE_DOT "NO")
129134

130135
set_property(DIRECTORY APPEND PROPERTY
131136
ADDITIONAL_MAKE_CLEAN_FILES
132137
"${DOXYFILE_OUTPUT_DIR}/${DOXYFILE_LATEX_DIR}")
133138

134-
if(DOXYFILE_LATEX STREQUAL "ON")
139+
if(DOXYFILE_LATEX)
135140
set(DOXYFILE_GENERATE_LATEX "YES")
136141
find_package(LATEX)
137142
find_program(DOXYFILE_MAKE make)
@@ -140,9 +145,6 @@ if(DOXYGEN_FOUND AND DOXYFILE_IN_FOUND)
140145
if(PDFLATEX_COMPILER)
141146
set(DOXYFILE_PDFLATEX "YES")
142147
endif()
143-
if(DOXYGEN_DOT_EXECUTABLE)
144-
set(DOXYFILE_DOT "YES")
145-
endif()
146148

147149
add_custom_command(TARGET doxygen
148150
POST_BUILD

0 commit comments

Comments
 (0)