[atk] meson: follow option convetions
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [atk] meson: follow option convetions
- Date: Tue, 17 Apr 2018 07:10:25 +0000 (UTC)
commit 67ffa20b53210b16972419bcf02f8a0702712cf9
Author: Ignacio Casal Quinteiro <qignacio amazon com>
Date: Tue Apr 17 08:44:15 2018 +0200
meson: follow option convetions
https://bugzilla.gnome.org/show_bug.cgi?id=795301
atk/meson.build | 4 +---
meson.build | 2 +-
meson_options.txt | 8 ++++----
3 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/atk/meson.build b/atk/meson.build
index 7b5a683..616a3e6 100644
--- a/atk/meson.build
+++ b/atk/meson.build
@@ -137,9 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk,
dependencies: gobject_dep,
sources: atk_enum_h)
-disable_introspection = get_option('disable_introspection')
-
-if not meson.is_cross_build() and not disable_introspection
+if not meson.is_cross_build() and get_option('introspection')
gnome.generate_gir(libatk,
sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ],
namespace: 'Atk',
diff --git a/meson.build b/meson.build
index b2384bd..539afbc 100644
--- a/meson.build
+++ b/meson.build
@@ -130,6 +130,6 @@ subdir('atk')
subdir('tests')
subdir('po')
-if get_option('enable_docs')
+if get_option('docs')
subdir('docs')
endif
diff --git a/meson_options.txt b/meson_options.txt
index 562a498..c4542dc 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,8 +1,8 @@
-option('enable_docs',
+option('docs',
description: 'Build API reference for ATK using GTK-Doc',
type: 'boolean',
value: false)
-option('disable_introspection',
- description: 'Do not build introspection files, even when GObject-Introspection is found',
+option('introspection',
+ description: 'Whether to build introspection files',
type: 'boolean',
- value: false)
+ value: true)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]