From 5032a9f13cdedec9bff673a5e87e9394a67a6c4e Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 18 May 2010 00:08:01 +0200 Subject: [PATCH] doxygen: Fixed latex pdf generation. --- cmake/Modules/UseDoxygen.cmake | 2 +- doc/doxy.config.in | 2 +- doc/doxy.trac.in | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/Modules/UseDoxygen.cmake b/cmake/Modules/UseDoxygen.cmake index ce99c386..88da565d 100644 --- a/cmake/Modules/UseDoxygen.cmake +++ b/cmake/Modules/UseDoxygen.cmake @@ -49,7 +49,7 @@ endif() if(DOXYGEN_FOUND AND DOXYFILE_IN_FOUND) add_custom_target(doxygen ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxy.config) - usedoxygen_set_default(DOXYFILE_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc") + usedoxygen_set_default(DOXYFILE_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}") usedoxygen_set_default(DOXYFILE_HTML_DIR "html") set_property(DIRECTORY APPEND PROPERTY diff --git a/doc/doxy.config.in b/doc/doxy.config.in index 232cd7e4..073d09e4 100644 --- a/doc/doxy.config.in +++ b/doc/doxy.config.in @@ -1015,7 +1015,7 @@ SEARCHENGINE = NO # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will # generate Latex output. -GENERATE_LATEX = NO +GENERATE_LATEX = @DOXYFILE_LATEX@ # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. # If a relative path is entered the value of OUTPUT_DIRECTORY will be diff --git a/doc/doxy.trac.in b/doc/doxy.trac.in index 9af6d641..dbd719aa 100644 --- a/doc/doxy.trac.in +++ b/doc/doxy.trac.in @@ -1026,13 +1026,13 @@ LATEX_OUTPUT = latex # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be # invoked. If left blank `latex' will be used as the default command name. -LATEX_CMD_NAME = @LATEX_COMPILER@ +LATEX_CMD_NAME = # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to # generate index for LaTeX. If left blank `makeindex' will be used as the # default command name. -MAKEINDEX_CMD_NAME = @MAKEINDEX_COMPILER@ +MAKEINDEX_CMD_NAME = # If the COMPACT_LATEX tag is set to YES Doxygen generates more compact # LaTeX documents. This may be useful for small projects and may help to