xeme/xeme

Make sure the gir target is added to the dependency

3 months ago, Gary Kramlich
841b70e8dbf5
Parents ad3533723a57
Children 3fa28d9884f6
Make sure the gir target is added to the dependency

Also clean up some variable names to match our other projects.

Testing Done:
Ran the following without issue

```
meson setup --wipe -Dintrospection=false -Ddoc=false build-no-introspection
ninja -C build-no-introspection/ turtles
```

Reviewed at https://reviews.imfreedom.org/r/2952/
1 files changed, 6 insertions(+), 5 deletions(-)
  • +6 -5
    xeme/meson.build
    • --- a/xeme/meson.build Fri Jan 26 02:55:19 2024 -0600
    +++ b/xeme/meson.build Sat Feb 10 01:39:41 2024 -0600
    @@ -28,7 +28,8 @@
    ]
    XEME_BUILT_HEADERS = []
    -XEME_GENERATED_SOURCES = []
    +XEME_BUILT_SOURCES = []
    +XEME_GENERATED_TARGETS = []
    ###############################################################################
    # xemeversionconsts.h
    @@ -73,7 +74,7 @@
    install_header : true,
    install_dir : get_option('includedir') / 'xeme-1.0' / 'xeme')
    -XEME_GENERATED_SOURCES += xeme_enums[0]
    +XEME_BUILT_SOURCES += xeme_enums[0]
    XEME_BUILT_HEADERS += xeme_enums[1]
    ###############################################################################
    @@ -82,7 +83,7 @@
    xeme_inc = include_directories('.')
    xeme_lib = library('xeme',
    - XEME_SOURCES + XEME_HEADERS + XEME_GENERATED_SOURCES + XEME_BUILT_HEADERS,
    + XEME_SOURCES + XEME_HEADERS + XEME_BUILT_SOURCES + XEME_BUILT_HEADERS,
    c_args : ['-DXEME_COMPILATION', '-DG_LOG_USE_STRUCTURED', '-DG_LOG_DOMAIN="Xeme"'],
    gnu_symbol_visibility : 'hidden',
    dependencies : [birb_dep, gio_dep, glib_dep, gobject_dep],
    @@ -116,7 +117,7 @@
    install : true,
    export_packages : ['xeme'],
    extra_args : ['--quiet', '-DXEME_COMPILATION'])
    - XEME_GENERATED_SOURCES += xeme_gir
    + XEME_GENERATED_TARGETS += xeme_gir
    endif
    ###############################################################################
    @@ -126,7 +127,7 @@
    dependencies : [gio_dep, glib_dep, gobject_dep],
    include_directories : [toplevel_inc, xeme_inc],
    link_with : xeme_lib,
    - sources : XEME_BUILT_HEADERS)
    + sources : XEME_BUILT_HEADERS + XEME_GENERATED_TARGETS)
    meson.override_dependency('xeme', xeme_dep)