diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-09-30 00:02:27 +0000 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2020-09-30 13:35:10 +0000 |
| commit | 2bea8f78c8b1ac4fb320817c23c03f59230ef9f3 (patch) | |
| tree | c8a09a3218395da09f828fe00fa1e8da019034bd /pango | |
| parent | bbdb6890f2c45a7f5353402fb723073d15227612 (diff) | |
| download | pango-2bea8f78c8b1ac4fb320817c23c03f59230ef9f3.tar.gz | |
Merge branch 'introspection' into 'master'cherry-pick-c64f4835
meson: Change introspection option to yielding feature
See merge request GNOME/pango!247
(cherry picked from commit c64f48351e57a58f4f355116efd2230d83c458c0)
82cfabba meson: Change introspection option to yielding feature
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/meson.build | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pango/meson.build b/pango/meson.build index 4c055f52..0b87b644 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -121,7 +121,8 @@ libpango = library( pango_dep_sources = [pango_enum_h] -build_gir = get_option('introspection') +gir = find_program('g-ir-scanner', required : get_option('introspection')) +build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled()) if build_gir gir_args = [ |