Guard running doxygen in parallel with a version check.

diff --git a/doc/doxygen/CMakeLists.txt b/doc/doxygen/CMakeLists.txt
index ed4655130e932f5c258c05dd2af00d1fd4a4e40a..29c082e97f8ef6fe4f503602fd48c78ee038f99d 100644 (file)
--- 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 c4e6e00744f0c55124423a64629e687de570bda8..9e0271628ef12cfe7345cbebf41c040c5c10d8ef 100644 (file)
--- 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