Merge branch 'fix-visibility-dep' into 'main'

gio: Fix missing visibility header dependency

See merge request GNOME/glib!3068
This commit is contained in:
Philip Withnall 2022-11-14 12:24:39 +00:00
commit c477e7aafe

View File

@ -786,7 +786,7 @@ gioenumtypes_c = custom_target('gioenumtypes_c',
'--template', files('gioenumtypes.c.template'), '--template', files('gioenumtypes.c.template'),
'@INPUT@', gnetworking_h]) '@INPUT@', gnetworking_h])
gioenumtypes_dep = declare_dependency(sources : [gioenumtypes_h, glib_enumtypes_h]) gioenumtypes_dep = declare_dependency(sources : [gioenumtypes_h, glib_enumtypes_h, gvisibility_h])
# inotify # inotify
if glib_conf.has('HAVE_SYS_INOTIFY_H') and have_func_inotify_init1 if glib_conf.has('HAVE_SYS_INOTIFY_H') and have_func_inotify_init1
@ -868,7 +868,6 @@ schemas_subdir = join_paths('glib-2.0', 'schemas')
libgio_dep = declare_dependency(link_with : libgio, libgio_dep = declare_dependency(link_with : libgio,
dependencies : [libgmodule_dep, libgobject_dep, gioenumtypes_dep], dependencies : [libgmodule_dep, libgobject_dep, gioenumtypes_dep],
sources: gvisibility_h,
include_directories : [gioinc], include_directories : [gioinc],
variables : [ variables : [
'schemasdir=' + join_paths(glib_datadir, schemas_subdir), 'schemasdir=' + join_paths(glib_datadir, schemas_subdir),