Commit 1c06be2e authored by Matthias Clasen's avatar Matthias Clasen

Merge branch 'introspection2' into 'master'

meson: Change introspection option to yielding feature

See merge request !252
parents bbdb6890 2a6bb537
Pipeline #217589 passed with stages
in 4 minutes and 40 seconds
...@@ -40,7 +40,7 @@ asan-build: ...@@ -40,7 +40,7 @@ asan-build:
needs: [] needs: []
variables: variables:
script: 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 - ninja -C _build
- .gitlab-ci/run-tests.sh _build - .gitlab-ci/run-tests.sh _build
allow_failure: true allow_failure: true
......
...@@ -4,8 +4,9 @@ option('gtk_doc', ...@@ -4,8 +4,9 @@ option('gtk_doc',
value: false) value: false)
option('introspection', option('introspection',
description: 'Build the GObject introspection data for Pango', description: 'Build the GObject introspection data for Pango',
type: 'boolean', type: 'feature',
value: true) value: 'auto',
yield: true)
option('install-tests', option('install-tests',
description : 'Install tests', description : 'Install tests',
type: 'boolean', type: 'boolean',
......
...@@ -121,7 +121,8 @@ libpango = library( ...@@ -121,7 +121,8 @@ libpango = library(
pango_dep_sources = [pango_enum_h] 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 if build_gir
gir_args = [ 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