gplugin/gplugin

Make doc/introspection options yield to parent.
develop
2020-08-22, Elliott Sales de Andrade
71e98ba93d21
Parents ed8e701cc2b1
Children e38f74f1b4d8
Make doc/introspection options yield to parent.

This allows `meson -Ddoc=false` to automatically propagate from Pidgin to the gplugin subproject, without having to specify `-Dgplugin:doc=false`.

Reviewed at https://reviews.imfreedom.org/r/87/
8 files changed, 10 insertions(+), 10 deletions(-)
  • +1 -1
    gplugin-gtk/meson.build
  • +1 -1
    gplugin/meson.build
  • +1 -1
    lua/meson.build
  • +3 -3
    meson_options.txt
  • +1 -1
    packaging/mingw-cross/PKGBUILD
  • +1 -1
    perl/meson.build
  • +1 -1
    python/meson.build
  • +1 -1
    vala/meson.build
    • --- a/gplugin-gtk/meson.build Thu Jul 23 20:16:27 2020 -0500
    +++ b/gplugin-gtk/meson.build Sat Aug 22 19:29:50 2020 -0500
    @@ -111,7 +111,7 @@
    ###############################################################################
    # GObject Introspection
    ###############################################################################
    -if get_option('gobject-introspection')
    +if get_option('introspection')
    gplugin_gtk_gir = gnome.generate_gir(
    gplugin_gtk,
    sources : GPLUGIN_GTK_SOURCES + GPLUGIN_GTK_HEADERS +
    --- a/gplugin/meson.build Thu Jul 23 20:16:27 2020 -0500
    +++ b/gplugin/meson.build Sat Aug 22 19:29:50 2020 -0500
    @@ -199,7 +199,7 @@
    ###############################################################################
    # GObject Introspection
    ###############################################################################
    -if get_option('gobject-introspection')
    +if get_option('introspection')
    gplugin_gir = gnome.generate_gir(gplugin,
    sources : GPLUGIN_SOURCES + GPLUGIN_HEADERS +
    GPLUGIN_PUBLIC_BUILT_SOURCES +
    --- a/lua/meson.build Thu Jul 23 20:16:27 2020 -0500
    +++ b/lua/meson.build Sat Aug 22 19:29:50 2020 -0500
    @@ -1,5 +1,5 @@
    if get_option('lua')
    - if not get_option('gobject-introspection')
    + if not get_option('introspection')
    error('Lua plugin requires GObject Introspection.')
    endif
    --- a/meson_options.txt Thu Jul 23 20:16:27 2020 -0500
    +++ b/meson_options.txt Sat Aug 22 19:29:50 2020 -0500
    @@ -1,12 +1,12 @@
    option(
    'doc',
    - type : 'boolean', value : true,
    + type : 'boolean', value : true, yield : true,
    description : 'build documentation with gtk-doc'
    )
    option(
    - 'gobject-introspection',
    - type : 'boolean', value : true,
    + 'introspection',
    + type : 'boolean', value : true, yield : true,
    description : 'Whether or not to build a GObject Introspection type library'
    )
    --- a/packaging/mingw-cross/PKGBUILD Thu Jul 23 20:16:27 2020 -0500
    +++ b/packaging/mingw-cross/PKGBUILD Sat Aug 22 19:29:50 2020 -0500
    @@ -28,7 +28,7 @@
    -Dlua=false \
    -Dperl=false \
    -Dpython3=false \
    - -Dgobject-introspection=false \
    + -Dintrospection=false \
    -Dvapi=false \
    -Dhelp2man=false \
    ../
    --- a/perl/meson.build Thu Jul 23 20:16:27 2020 -0500
    +++ b/perl/meson.build Sat Aug 22 19:29:50 2020 -0500
    @@ -1,5 +1,5 @@
    if get_option('perl')
    - if not get_option('gobject-introspection')
    + if not get_option('introspection')
    error('Perl plugin requires GObject Introspection.')
    endif
    --- a/python/meson.build Thu Jul 23 20:16:27 2020 -0500
    +++ b/python/meson.build Sat Aug 22 19:29:50 2020 -0500
    @@ -1,5 +1,5 @@
    if get_option('python3')
    - if not get_option('gobject-introspection')
    + if not get_option('introspection')
    error('Python plugin requires GObject Introspection.')
    endif
    --- a/vala/meson.build Thu Jul 23 20:16:27 2020 -0500
    +++ b/vala/meson.build Sat Aug 22 19:29:50 2020 -0500
    @@ -1,5 +1,5 @@
    if get_option('vapi')
    - if not get_option('gobject-introspection')
    + if not get_option('introspection')
    error('Vala generation requires GObject Introspection.')
    endif