[json-glib: 2/7] Change introspection option to feature type
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [json-glib: 2/7] Change introspection option to feature type
- Date: Wed, 23 Jan 2019 15:31:00 +0000 (UTC)
commit 461edcc8cd6dc1c4efeb09aaaba02459293546f2
Author: Xavier Claessens <xavier claessens collabora com>
Date: Sat Oct 27 06:30:47 2018 -0400
Change introspection option to feature type
json-glib/meson.build | 4 ++--
meson_options.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/json-glib/meson.build b/json-glib/meson.build
index bc8469a..035e954 100644
--- a/json-glib/meson.build
+++ b/json-glib/meson.build
@@ -93,8 +93,8 @@ pkgg.generate(
requires: 'gio-2.0',
)
-build_gir = get_option('introspection')
-if build_gir
+gir = find_program('g-ir-scanner', required : get_option('introspection'))
+if gir.found()
gir_args = [
'--quiet',
'--c-include=json-glib/json-glib.h',
diff --git a/meson_options.txt b/meson_options.txt
index 75152aa..aba8129 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,5 @@
option('introspection',
- type: 'boolean', value: true,
+ type: 'feature', value: 'auto', yield: true,
description: 'Build the introspection data (requires gobject-introspection)')
option('docs',
type: 'boolean', value: false,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]