From c16575c850dfb81239e9fb25502347d4bee214c2 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Fri, 2 Aug 2024 12:01:58 -0400 Subject: [PATCH] [cmake] Fix issue with Doxygen output directory --- doc/CMakeLists.txt | 5 +---- doc/Doxyfile.in | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 4d4b9f0..373c56e 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -46,10 +46,6 @@ endif() find_package(Doxygen REQUIRED) -# Set input and output directories -set(DOXYGEN_INPUT_DIR ${PROJECT_SOURCE_DIR}/c++) -set(DOXYGEN_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/doxygen) - # Configure Doxyfile configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) @@ -61,6 +57,7 @@ add_custom_target(doxygen ALL COMMENT "Generating Doxygen documentation" VERBATIM ) +add_dependencies(doxygen ${PROJECT_NAME}_docs_sphinx) # --------------------------------- # Install diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 9e26b84..0b82fc9 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -68,7 +68,7 @@ PROJECT_LOGO = # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = html/doxygen +OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@/html/doxygen # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 # sub-directories (in 2 levels) under the output directory of each output format @@ -2733,4 +2733,4 @@ GENERATE_LEGEND = YES # files. # The default value is: YES. -DOT_CLEANUP = YES \ No newline at end of file +DOT_CLEANUP = YES