diff options
| -rw-r--r-- | docs/reference/meson.build | 13 | ||||
| -rw-r--r-- | meson.build | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/docs/reference/meson.build b/docs/reference/meson.build index a9cfc4d..ab7c9f8 100644 --- a/docs/reference/meson.build +++ b/docs/reference/meson.build @@ -12,12 +12,21 @@ tag_file_modules = [ 'sigc++-2.0', ] 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('CAIROMM_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, @@ -86,6 +95,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 index c490382..eda3f91 100644 --- a/meson.build +++ b/meson.build @@ -274,7 +274,7 @@ if can_add_dist_script project_source_root, ) # Add build scripts to the distribution directory, and delete .gitignore - # files and an empty $MESON_DIST_ROOT/build/ directory. + # files and an empty $MESON_PROJECT_DIST_ROOT/build/ directory. meson.add_dist_script( python3.path(), dist_build_scripts_py, project_source_root, @@ -289,6 +289,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 cairomm_dep = declare_dependency( dependencies: cairomm_own_dep, |