diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-09-30 17:51:15 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-09-30 17:51:15 +0000 |
| commit | 1c06be2e50d86a891be02e2699725e7549daa11c (patch) | |
| tree | c8a09a3218395da09f828fe00fa1e8da019034bd | |
| parent | bbdb6890f2c45a7f5353402fb723073d15227612 (diff) | |
| parent | 2a6bb53779c760dfabad9e8e8ae225dc12ac5631 (diff) | |
| download | pango-1c06be2e50d86a891be02e2699725e7549daa11c.tar.gz | |
Merge branch 'introspection2' into 'master'
meson: Change introspection option to yielding feature
See merge request GNOME/pango!252
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | meson_options.txt | 5 | ||||
| -rw-r--r-- | pango/meson.build | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dffa8056..c287010c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,7 @@ asan-build: needs: [] variables: script: - - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=false _build + - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled _build - ninja -C _build - .gitlab-ci/run-tests.sh _build allow_failure: true diff --git a/meson_options.txt b/meson_options.txt index 5aa7c795..235b8a48 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,8 +4,9 @@ option('gtk_doc', value: false) option('introspection', description: 'Build the GObject introspection data for Pango', - type: 'boolean', - value: true) + type: 'feature', + value: 'auto', + yield: true) option('install-tests', description : 'Install tests', type: 'boolean', 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 = [ |