Commit 2bea8f78 authored by Matthias Clasen's avatar Matthias Clasen Committed by Xavier Claessens

Merge branch 'introspection' into 'master'

meson: Change introspection option to yielding feature

See merge request !247

(cherry picked from commit c64f4835)

82cfabba meson: Change introspection option to yielding feature
parent bbdb6890
Pipeline #217519 passed with stages
in 2 minutes and 58 seconds
......@@ -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
......
......@@ -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',
......
......@@ -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 = [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment