luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-10 12:55:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'schemasdir' into 'master'

Browse Source 
gio: Provide schemas directory information in pkg-config file

See merge request GNOME/glib!274
This commit is contained in:
Philip Withnall 2018-08-27 13:19:38 +00:00
commit b9cfbf0e62
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio-2.0.pc.in
View File

@ -3,6 +3,8 @@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
datadir=@datadir@
schemasdir=${datadir}/glib-2.0/schemas
giomoduledir=@GIO_MODULE_DIR@ giomoduledir=@GIO_MODULE_DIR@
glib_compile_schemas=glib-compile-schemas glib_compile_schemas=glib-compile-schemas
glib_compile_resources=glib-compile-resources glib_compile_resources=glib-compile-resources

8
gio/meson.build
View File

@ -804,10 +804,14 @@ if giomodulesdir == ''
giomodulesdir = join_paths('${libdir}', 'gio', 'modules') giomodulesdir = join_paths('${libdir}', 'gio', 'modules')
endif endif
schemas_subdir = join_paths('glib-2.0', 'schemas')
pkg.generate(libraries : libgio, pkg.generate(libraries : libgio,
libraries_private : [osx_ldflags], libraries_private : [osx_ldflags],
requires : ['glib-2.0', 'gobject-2.0'], requires : ['glib-2.0', 'gobject-2.0'],
variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')),
'schemasdir=' + join_paths('${datadir}', schemas_subdir),
'bindir=' + join_paths('${prefix}', get_option('bindir')),
'giomoduledir=' + giomodulesdir, 'giomoduledir=' + giomodulesdir,
'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'),
@ -945,7 +949,7 @@ executable('gsettings', 'gsettings-tool.c',
link_args : noseh_link_args, link_args : noseh_link_args,
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
install_data('gschema.dtd', install_data('gschema.dtd',
install_dir : join_paths(get_option('datadir'), 'glib-2.0/schemas')) install_dir : join_paths(get_option('datadir'), schemas_subdir))
install_data(['gschema.loc', 'gschema.its'], install_data(['gschema.loc', 'gschema.its'],
install_dir : join_paths(get_option('datadir'), 'gettext/its')) install_dir : join_paths(get_option('datadir'), 'gettext/its'))