[pango/meson-option-names] meson: Use 'standard' option names
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango/meson-option-names] meson: Use 'standard' option names
- Date: Mon, 1 Jul 2019 14:08:02 +0000 (UTC)
commit 3038b0c4e8c78377553679701b94ed7c867f4c52
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Jul 1 14:04:23 2019 +0000
meson: Use 'standard' option names
Use 'documentation' for gtk-doc and 'introspection'
for, well, introspection. This matches what GTK has.
Fixes https://gitlab.gnome.org/GNOME/pango/issues/364
meson.build | 2 +-
meson_options.txt | 4 ++--
pango/meson.build | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index 37fe7131..5e2d44be 100644
--- a/meson.build
+++ b/meson.build
@@ -515,6 +515,6 @@ subdir('examples')
subdir('tests')
subdir('tools')
-if get_option('enable_docs')
+if get_option('documentation')
subdir('docs')
endif
diff --git a/meson_options.txt b/meson_options.txt
index ac641269..7ff1aa2c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,8 +1,8 @@
-option('enable_docs',
+option('documentation',
description: 'Build API reference for Pango using GTK-Doc',
type: 'boolean',
value: false)
-option('gir',
+option('introspection',
description: 'Build the GObject introspection data for Pango',
type: 'boolean',
value: true)
diff --git a/pango/meson.build b/pango/meson.build
index 9dd02bdc..6d35cc32 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -122,7 +122,7 @@ libpango = library(
pango_dep_sources = [pango_enum_h]
-build_gir = get_option('gir')
+build_gir = get_option('introspection')
if build_gir
gir_args = [
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]