chiark / gitweb /
Fix doxygen base path resolution.
authorMarin <marin.jurjevic@hotmail.com>
Tue, 15 Sep 2020 14:30:26 +0000 (16:30 +0200)
committerVladimír Vondruš <mosra@centrum.cz>
Sat, 7 Nov 2020 16:35:30 +0000 (17:35 +0100)
Use top-level doxygen path as base path. In case of recursive descent,
don't allow base path to be overriden.

documentation/doxygen.py

index 4ca2e45b21724073a1665507bb980cc647a1ac99..2276e4120cf94161776c5c1cc4d60ef24d5b93cf 100755 (executable)
@@ -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))