talkatu/talkatu

Make doc/introspection options yield to parent.

2020-08-22, Elliott Sales de Andrade
2aca0bb872fb
Parents 3b6c635cef20
Children bde456446ed7
Make doc/introspection options yield to parent.

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

Reviewed at https://reviews.imfreedom.org/r/86/
4 files changed, 7 insertions(+), 7 deletions(-)
  • +3 -3
    meson_options.txt
  • +1 -1
    packaging/mingw-cross/PKGBUILD
  • +1 -1
    talkatu/meson.build
  • +2 -2
    vapi/meson.build
    • --- a/meson_options.txt Thu Aug 20 20:46:49 2020 -0500
    +++ b/meson_options.txt Sat Aug 22 19:28:13 2020 -0500
    @@ -9,7 +9,7 @@
    option(
    'doc',
    - type : 'boolean', value : true,
    + type : 'boolean', value : true, yield : true,
    description : 'build documentation with gtk-doc'
    )
    @@ -20,8 +20,8 @@
    )
    option(
    - 'gobject-introspection',
    - type : 'boolean', value : true,
    + 'introspection',
    + type : 'boolean', value : true, yield : true,
    description : 'build gobject-introspection support'
    )
    --- a/packaging/mingw-cross/PKGBUILD Thu Aug 20 20:46:49 2020 -0500
    +++ b/packaging/mingw-cross/PKGBUILD Sat Aug 22 19:28:13 2020 -0500
    @@ -31,7 +31,7 @@
    --prefix=/${MINGW_PACKAGE_PREFIX} \
    --cross-file=${MINGW_PACKAGE_PREFIX}.txt \
    -Ddoc=false \
    - -Dgobject-introspection=false \
    + -Dintrospection=false \
    -Dvapi=false \
    -Dhelp2man=false \
    ..
    --- a/talkatu/meson.build Thu Aug 20 20:46:49 2020 -0500
    +++ b/talkatu/meson.build Sat Aug 22 19:28:13 2020 -0500
    @@ -199,7 +199,7 @@
    ###############################################################################
    # GObject Introspection
    ###############################################################################
    -if get_option('gobject-introspection')
    +if get_option('introspection')
    talkatu_gir = gnome.generate_gir(talkatu,
    sources : TALKATU_SOURCES + TALKATU_HEADERS +
    TALKATU_PUBLIC_BUILT_SOURCES +
    --- a/vapi/meson.build Thu Aug 20 20:46:49 2020 -0500
    +++ b/vapi/meson.build Sat Aug 22 19:28:13 2020 -0500
    @@ -1,11 +1,11 @@
    if get_option('vapi')
    - if not get_option('gobject-introspection')
    + if not get_option('introspection')
    error('Vala generation requires GObject Introspection.')
    endif
    add_languages('vala')
    - talkatuu_vapi = gnome.generate_vapi('talkatu',
    + talkatu_vapi = gnome.generate_vapi('talkatu',
    sources : talkatu_gir[0],
    packages : [ 'gtk+-3.0' ],
    install : true,