Add dependencies to Doxygen tag files in subprojects

kjellahl · kjellahl · commit 465ea8ca5f7a · 2021-05-18T11:50:56.000+02:00
Doxygen in a main project shall not be called before tag files have been
created or updated in subprojects.
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
@@ -12,12 +12,21 @@ tag_file_modules = [
   'mm-common-libstdc++',
 ]
 doxygen_tagfiles = ''
+doxygen_tag_targets = []
 docinstall_flags = []
 foreach module : tag_file_modules
   depmod = dependency(module, required: false)
   if depmod.found()
     doxytagfile = depmod.get_variable(pkgconfig: 'doxytagfile', internal: 'doxytagfile', default_value: '')
     if doxytagfile != ''
+      if depmod.type_name() == 'internal'
+        # Subprojects must build their tag files before doxygen is called.
+        if module.startswith('mm-common')
+          doxygen_tag_targets += subproject('mm-common').get_variable('global_tag_file_target')
+        else
+          doxygen_tag_targets += subproject(module).get_variable('global_tag_file_target')
+        endif
+      endif
       htmlrefpub = depmod.get_variable(pkgconfig: 'htmlrefpub', internal: 'htmlrefpub', default_value: '')
       htmlrefdir = depmod.get_variable(pkgconfig: 'htmlrefdir', internal: 'htmlrefdir', default_value: '')
       if htmlrefpub == ''
@@ -51,7 +60,7 @@ doc_conf_data.set('abs_top_srcdir', project_source_root)
 doc_conf_data.set('LIBXMLXX_MODULE_NAME', book_name)
 doc_conf_data.set('DOXYGEN_TAGFILES', doxygen_tagfiles)
 
-configure_file(
+doxyfile = configure_file(
   input: 'Doxyfile.in',
   output: '@BASENAME@',
   configuration: doc_conf_data,
@@ -87,6 +96,8 @@ tag_file = custom_target('html_and_tag',
     '@OUTPUT@',
     '@INPUT@',
   ],
+  depend_files: doxyfile,
+  depends: doxygen_tag_targets,
   build_by_default: build_documentation,
   install: true,
   install_dir: install_reference_docdir,
diff --git a/meson.build b/meson.build
@@ -330,6 +330,8 @@ if meson.is_subproject()
   }
   if build_documentation
     pkgconfig_vars += {'doxytagfile': tag_file.full_path()}
+    # May be used in a main project.
+    global_tag_file_target = tag_file
   endif
   xmlxx_dep = declare_dependency(
     dependencies: xmlxx_own_dep,

Original file line number	Diff line number	Diff line change
`@@ -330,6 +330,8 @@ if meson.is_subproject()`
`330`	`330`	`}`
`331`	`331`	`if build_documentation`
`332`	`332`	`pkgconfig_vars += {'doxytagfile': tag_file.full_path()}`
	`333`	`+ # May be used in a main project.`
	`334`	`+ global_tag_file_target = tag_file`
`333`	`335`	`endif`
`334`	`336`	`xmlxx_dep = declare_dependency(`
`335`	`337`	`dependencies: xmlxx_own_dep,`