From 2b37efde40165f62acd98f25627b28f7995c30d6 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 4 Oct 2022 11:51:13 -0600 Subject: [PATCH] Guard running doxygen in parallel with a version check. --- doc/doxygen/CMakeLists.txt | 14 ++++++++++++++ doc/doxygen/options.dox.in | 2 -- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/doc/doxygen/CMakeLists.txt b/doc/doxygen/CMakeLists.txt index ed4655130e..29c082e97f 100644 --- a/doc/doxygen/CMakeLists.txt +++ b/doc/doxygen/CMakeLists.txt @@ -34,6 +34,7 @@ IF(NOT DOXYGEN_FOUND) ) ENDIF() + ######################################################################## # # Process the tutorial and code-gallery files into inputs for doxygen @@ -272,6 +273,19 @@ FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/options.dox" " ) +# If we use a reasonably modern doxygen version, make sure it is run in parallel +IF(NOT (${DOXYGEN_VERSION} VERSION_LESS 1.9)) + FILE(APPEND "${CMAKE_CURRENT_BINARY_DIR}/options.dox" + " + NUM_PROC_THREADS = 0 + DOT_NUM_THREADS = 0 + " + ) + MESSAGE(STATUS "Letting doxygen run with multiple threads") +ENDIF() + + + ######################################################################## # # And, finally, call doxygen: diff --git a/doc/doxygen/options.dox.in b/doc/doxygen/options.dox.in index c4e6e00744..9e0271628e 100644 --- a/doc/doxygen/options.dox.in +++ b/doc/doxygen/options.dox.in @@ -77,7 +77,6 @@ EXAMPLE_RECURSIVE = NO IMAGE_PATH = INPUT_FILTER = ${CMAKE_SOURCE_DIR}/doc/doxygen/scripts/filter.pl FILTER_SOURCE_FILES = YES -NUM_PROC_THREADS = 0 # Have some user defined commands that we can use in the documentation # and that expands to specific text. For some more transformations, see @@ -291,7 +290,6 @@ DOT_TRANSPARENT = NO GENERATE_LEGEND = YES DOT_CLEANUP = YES -DOT_NUM_THREADS = 0 #--------------------------------------------------------------------------- # Configuration::additions related to the search engine -- 2.39.5