Merge branch 'fix-gir-install' into 'main'

girepository/introspection: correctly install .gir files into custom locations

See merge request GNOME/glib!4020
This commit is contained in:
Philip Withnall 2024-04-23 13:34:06 +00:00
commit 954184211b

View File

@ -49,6 +49,7 @@ glib_gir = gnome.generate_gir(libglib,
export_packages: 'glib-2.0',
header: 'glib.h',
install: true,
install_dir_gir: glib_girdir,
dependencies: [
libgobject_dep,
],
@ -76,6 +77,7 @@ if host_system == 'windows'
header: 'glib.h',
includes: [ glib_gir[0] ],
install: true,
install_dir_gir: glib_girdir,
dependencies: [
libgobject_dep,
],
@ -104,6 +106,7 @@ else
header: 'glib.h',
includes: [ glib_gir[0] ],
install: true,
install_dir_gir: glib_girdir,
dependencies: [
libgobject_dep,
],
@ -137,6 +140,7 @@ gobject_gir = gnome.generate_gir(libgobject,
header: 'glib-object.h',
includes: [ glib_gir[0] ],
install: true,
install_dir_gir: glib_girdir,
env: gi_gen_env_variables,
extra_args: gir_args + [
'-DGOBJECT_COMPILATION',
@ -162,6 +166,7 @@ gmodule_gir = gnome.generate_gir(libgmodule,
header: 'gmodule.h',
includes: [ glib_gir[0] ],
install: true,
install_dir_gir: glib_girdir,
dependencies: [
libglib_dep,
],
@ -224,6 +229,7 @@ gio_gir = gnome.generate_gir(libgio,
header: 'gio/gio.h',
includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0] ],
install: true,
install_dir_gir: glib_girdir,
dependencies: [
libglib_dep,
libgobject_dep,
@ -249,6 +255,7 @@ if host_system == 'windows'
header: 'gio/gio.h',
includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ],
install: true,
install_dir_gir: glib_girdir,
dependencies: [
libglib_dep,
libgobject_dep,
@ -277,6 +284,7 @@ else
header: 'gio/gio.h',
includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ],
install: true,
install_dir_gir: glib_girdir,
dependencies: [
libglib_dep,
libgobject_dep,
@ -314,6 +322,7 @@ girepository_gir = gnome.generate_gir(libgirepository,
header: 'girepository/girepository.h',
includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ],
install: true,
install_dir_gir: glib_girdir,
dependencies: [ libglib_dep, libgobject_dep, libgmodule_dep, libgio_dep ],
extra_args: gir_args + libgirepository_gir_args,
)