From 49186598c89d739ebe1b149e460cf38f8bd360fb Mon Sep 17 00:00:00 2001 From: Marin Date: Tue, 15 Sep 2020 16:30:26 +0200 Subject: [PATCH] Fix doxygen base path resolution. Use top-level doxygen path as base path. In case of recursive descent, don't allow base path to be overriden. --- documentation/doxygen.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/documentation/doxygen.py b/documentation/doxygen.py index 4ca2e45b..2276e412 100755 --- a/documentation/doxygen.py +++ b/documentation/doxygen.py @@ -3354,7 +3354,10 @@ def parse_index_xml(state: State, xml): return parsed def parse_doxyfile(state: State, doxyfile, values = None): - state.basedir = os.path.dirname(doxyfile) + # Use top-level Doxyfile path as base, don't let it get overriden by + # subsequently @INCLUDE'd Doxyfile + if not state.basedir: + state.basedir = os.path.dirname(doxyfile) logging.debug("Parsing configuration from {}".format(doxyfile)) -- 2.30.2