diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-07-01 14:04:23 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-07-01 16:49:04 +0000 |
| commit | 71461689b0e34d873018d46bff555475019fbf4a (patch) | |
| tree | 1b401d51a28c7b33689bd54406af35cb665e5ecd | |
| parent | d15702c43770f8ce99145e02a85a54b213885986 (diff) | |
| download | pango-71461689b0e34d873018d46bff555475019fbf4a.tar.gz | |
meson: Use 'standard' option names
Use 'gtk_doc' for documentation and 'introspection'
for, well, introspection. This matches what the rest
of the stack does.
Fixes https://gitlab.gnome.org/GNOME/pango/issues/364
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | meson_options.txt | 4 | ||||
| -rw-r--r-- | pango/meson.build | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 37fe7131..73b5da2b 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('gtk_doc') subdir('docs') endif diff --git a/meson_options.txt b/meson_options.txt index ac641269..95d7edb8 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,8 +1,8 @@ -option('enable_docs', +option('gtk_doc', 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 = [ |