luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-24 22:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3488-introspection-checks' into 'main'

Browse Source 
build: Check for gobject-introspection-1.0 as well as g-ir-scanner

Closes #3488

See merge request GNOME/glib!4329
This commit is contained in:
Philip Withnall 2024-10-07 13:46:04 +00:00
commit 4416d9dcce
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
meson.build
View File

@ -2605,9 +2605,18 @@ if enable_systemtap
stp_cdata.set('LT_REVISION', micro_version) stp_cdata.set('LT_REVISION', micro_version)
endif endif
# introspection # Introspection
gir_scanner = find_program('g-ir-scanner', required: get_option('introspection'), version: '>= 1.80.0') #
enable_gir = get_option('introspection').allowed() and gir_scanner.found() and meson.can_run_host_binaries() # We depend on g-ir-scanner from gobject-introspection-1.0 to scan our source
# to build GIR files. We then use gi-compile-repository from the local build
# tree to build the typelibs (rather than using g-ir-compiler from
# gobject-introspection). However, we use Meson’s gnome.generate_gir() function,
# which adds a hard dependency on gobject-introspection-1.0, so we’d better
# check for that here.
gobject_introspection_required_version = '>= 1.80.0'
gir_scanner = find_program('g-ir-scanner', required: get_option('introspection'), version: gobject_introspection_required_version)
gobject_introspection = dependency('gobject-introspection-1.0', required: get_option('introspection'), version: gobject_introspection_required_version)
enable_gir = get_option('introspection').allowed() and gir_scanner.found() and gobject_introspection.found() and meson.can_run_host_binaries()
if get_option('introspection').enabled() and not meson.can_run_host_binaries() if get_option('introspection').enabled() and not meson.can_run_host_binaries()
error('Running binaries on the build host needs to be supported to build with -Dintrospection=enabled') error('Running binaries on the build host needs to be supported to build with -Dintrospection=enabled')