luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Meson: Fix build of gtkdoc

Browse Source 
This requires change added in Meson 0.44.0

https://bugzilla.gnome.org/show_bug.cgi?id=786796
This commit is contained in:
Xavier Claessens 2017-11-09 20:35:45 -05:00 committed by Xavier Claessens
parent 6d0210240a
commit fa8d42de2e
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/reference/gio/meson.build
View File

@ -52,9 +52,12 @@ if get_option('with-docs') != 'no'
'gnetworkmonitorbase.h', 'gnetworkmonitorbase.h',
'gnetworkmonitornetlink.h', 'gnetworkmonitornetlink.h',
'gnetworkmonitornm.h', 'gnetworkmonitornm.h',
'gnetworkmonitorportal.h',
'gnotificationbackend.h', 'gnotificationbackend.h',
'gnotification-private.h', 'gnotification-private.h',
'gosxappinfo.h',
'gpollfilemonitor.h', 'gpollfilemonitor.h',
'gproxyresolverportal.h',
'gregistrysettingsbackend.h', 'gregistrysettingsbackend.h',
'gresourcefile.h', 'gresourcefile.h',
'gsettingsbackendinternal.h', 'gsettingsbackendinternal.h',

3
docs/reference/gobject/meson.build
View File

@ -72,12 +72,15 @@ if get_option('with-docs') != 'no'
configuration: version_conf configuration: version_conf
) )
gtkdocincl = include_directories('.')
gnome.gtkdoc('gobject', gnome.gtkdoc('gobject',
main_xml : 'gobject-docs.xml', main_xml : 'gobject-docs.xml',
namespace : 'g', namespace : 'g',
gobject_typesfile : join_paths(meson.current_source_dir(), 'gobject.types'), gobject_typesfile : join_paths(meson.current_source_dir(), 'gobject.types'),
mode : 'none', mode : 'none',
dependencies : [libgobject_dep, libglib_dep], dependencies : [libgobject_dep, libglib_dep],
include_directories : [gtkdocincl],
src_dir : 'gobject', src_dir : 'gobject',
scan_args : [ scan_args : [
'--deprecated-guards=G_DISABLE_DEPRECATED', '--deprecated-guards=G_DISABLE_DEPRECATED',

2
meson.build
View File

@ -1,6 +1,6 @@
project('glib', 'c', 'cpp', project('glib', 'c', 'cpp',
version : '2.55.0', version : '2.55.0',
meson_version : '>= 0.38.1', meson_version : '>= 0.44.0',
default_options : [ default_options : [
'warning_level=1', 'warning_level=1',
'c_std=gnu89' 'c_std=gnu89'