Merge branch 'ebassi/doc-gir-include-path' into 'main'

build: Fix the inclusion paths for GIR files in gi-docgen

See merge request GNOME/glib!3688
This commit is contained in:
Philip Withnall 2023-11-02 12:26:01 +00:00
commit 7785c5150a
4 changed files with 7 additions and 4 deletions

View File

@ -244,8 +244,9 @@ custom_target('gio-docs',
'--config=@INPUT0@',
'--output-dir=@OUTPUT@',
'--content-dir=@0@'.format(meson.current_source_dir()),
'--add-include-path=@0@'.format(meson.current_source_dir() / '../glib'),
'--add-include-path=@0@'.format(meson.current_source_dir() / '../gobject'),
'--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gobject'),
'--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gmodule'),
'--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gio'),
'@INPUT1@',
],
build_by_default: true,

View File

@ -178,6 +178,7 @@ custom_target('glib-docs',
'--config=@INPUT0@',
'--output-dir=@OUTPUT@',
'--content-dir=@0@'.format(meson.current_source_dir()),
'--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gobject'),
'@INPUT1@',
],
build_by_default: true,

View File

@ -14,7 +14,8 @@ custom_target('gmodule-docs',
'--config=@INPUT0@',
'--output-dir=@OUTPUT@',
'--content-dir=@0@'.format(meson.current_source_dir()),
'--add-include-path=@0@'.format(meson.current_source_dir() / '../glib'),
'--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gobject'),
'--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gmodule'),
'@INPUT1@',
],
build_by_default: true,

View File

@ -89,7 +89,7 @@ custom_target('gobject-docs',
'--config=@INPUT0@',
'--output-dir=@OUTPUT@',
'--content-dir=@0@'.format(meson.current_source_dir()),
'--add-include-path=@0@'.format(meson.current_source_dir() / '../glib'),
'--add-include-path=@0@'.format(meson.current_build_dir() / '../../../gobject'),
'@INPUT1@',
],
build_by_default: true,