luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gtkdoc-check-fix' into 'master'

Browse Source 
Various fixes to make gtkdoc-check pass on glib

See merge request GNOME/glib!978
This commit is contained in:
Philip Withnall
2020-01-31 13:23:42 +00:00
parent c07d9434f4 527d6201c3
commit e855e30d6d
17 changed files with 278 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gio/tests/gdbus-object-manager-example/meson.build
View File

@@ -1,6 +1,7 @@
# FIXME: set UNINSTALLED_GLIB_{SRC|BUILD}DIR=top_{src|build}dir ?
gdbus_example_objectmanager_xml = files('gdbus-example-objectmanager.xml')
gdbus_example_objectmanager_generated = custom_target('objectmanager-gen',
input : ['gdbus-example-objectmanager.xml'],
input : gdbus_example_objectmanager_xml,
output : ['objectmanager-gen.h',
'objectmanager-gen.c',
'objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Animal.xml',
@@ -23,4 +24,5 @@ libgdbus_example_objectmanager = library('gdbus-example-objectmanager',
libgdbus_example_objectmanager_dep = declare_dependency(
sources : gdbus_example_objectmanager_generated[0],
link_with : libgdbus_example_objectmanager)
link_with : libgdbus_example_objectmanager,
dependencies : [libgio_dep])

5
gio/tests/meson.build
View File

@@ -431,6 +431,11 @@ test_extra_programs += {
},
}
gdbus_example_objectmanager_sources = files(
'gdbus-example-objectmanager-client.c',
'gdbus-example-objectmanager-server.c',
)
if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
test_extra_programs += {
# These three are manual-run tests because they need a session bus but don't bring one up themselves