]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Also inform doxygen about the change in the previous commit. 18087/head
authorWolfgang Bangerth <bangerth@colostate.edu>
Wed, 5 Feb 2025 00:00:07 +0000 (17:00 -0700)
committerWolfgang Bangerth <bangerth@colostate.edu>
Wed, 5 Feb 2025 00:08:14 +0000 (17:08 -0700)
doc/doxygen/CMakeLists.txt
doc/doxygen/options.dox.in

index 0081b695dc43fce2698c880df6653f8af16de12d..7236f8cbd427d57929b7388d3e7b0dfb37f36a14 100644 (file)
@@ -83,26 +83,20 @@ else()
 endif()
 
 
-# Collect where the build system will write the .inst files after
+# Note where the build system will write the .inst files after
 # expansion from the .inst.in files. We need this because we let
 # doxygen read the .cc files and they #include the .inst files.
 #
-# To get at this, find all of the .inst.in files, strip all but the
-# directory name under $CMAKE_SOURCE_DIR/source, and then prepend
-# the build directory to it
+# The .cc files #include the .inst files with the directory name
+# relative to the /source directory under the build directory, so the
+# correct include path is <build dir>/source
 #
-# See options.dox.in where ${_inst_in_dirs} is later added to INCLUDE_PATH.
-file(GLOB _inst_in_files
-     "${CMAKE_SOURCE_DIR}/source/*/*.inst.in")
-string(REPLACE "${CMAKE_SOURCE_DIR}/source/" "" _inst_in_dirs_x "${_inst_in_files}")
-string(REGEX REPLACE "/[a-zA-Z0-9_\\.]*.inst.in" "/" _inst_in_dirs_y "${_inst_in_dirs_x}")
-list(REMOVE_DUPLICATES _inst_in_dirs_y)
-set(_inst_in_dirs "")
-foreach (_dir ${_inst_in_dirs_y})
-  set(_inst_in_dirs "${_inst_in_dirs} ${CMAKE_BINARY_DIR}/source/${_dir}")
-endforeach()
+# This variable is used in options.dox.in where ${_inst_in_dir} is
+# added to INCLUDE_PATH.
+set(_inst_in_dir "${CMAKE_BINARY_DIR}/source/")
+
 
-message(STATUS "Additional doxygen include paths: ${_inst_in_dirs}")
+message(STATUS "Additional doxygen include path: ${_inst_in_dir}")
 
 # make sure doxygen sees the extra.sty stylefile:
 set(_extra_packages "${CMAKE_CURRENT_SOURCE_DIR}/extra")
index fee22a0cf596282d5ded95ad265832740d07b1b3..e549b417a06cb2038a9901ed121cbf18e8dac96f 100644 (file)
@@ -162,7 +162,7 @@ ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = YES
 EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = @CMAKE_SOURCE_DIR@/include @CMAKE_BINARY_DIR@/include @_inst_in_dirs@
+INCLUDE_PATH           = @CMAKE_SOURCE_DIR@/include @CMAKE_BINARY_DIR@/include @_inst_in_dir@
 INCLUDE_FILE_PATTERNS  =
 
 # Set a few variables that help us generate documentation for things

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.