[Spice-commits] 2 commits - src/meson.build vapi/meson.build

[GitLab Mirror]

 src/meson.build  |    2 +-
 vapi/meson.build |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b7d07c80cf2f15645d8d717dbb53b37d2c68f764
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Mon Sep 3 10:58:26 2018 +0100

    build: Fix VAPI include directory
    
    If gir files are not installed generate_vapi is not able to
    find generated gir files, so look also in src generated files.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>

diff --git a/vapi/meson.build b/vapi/meson.build
index 4737715..de9adb9 100644
--- a/vapi/meson.build
+++ b/vapi/meson.build
@@ -7,6 +7,7 @@ if spice_gtk_has_vala
     gnome.generate_vapi('spice-client-gtk-3.0',
                         install : true,
                         packages : ['gtk+-3.0', 'spice-client-glib-2.0'],
+                        gir_dirs : join_paths(meson.build_root(), 'src'),
                         vapi_dirs : meson.current_build_dir(),
                         sources : spice_client_gtk_gir[0])
   endif
commit 45066388df0c6c09707cf2c82c60a103369a864a
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Mon Sep 3 10:57:31 2018 +0100

    build: Fix gir dependencies
    
    File generated should be depends on currently files built, not from
    installed files, so use target objects for spice-gtk dependency
    on spice-lib.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>

diff --git a/src/meson.build b/src/meson.build
index 829a89c..b2188af 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -369,7 +369,7 @@ if spice_gtk_has_gtk
                                             export_packages : 'spice-client-gtk-3.0',
                                             extra_args : ['--accept-unprefixed'],
                                             header : 'spice-widget.h',
-                                            includes : ['GObject-2.0', 'Gtk-3.0', 'SpiceClientGLib-2.0'],
+                                            includes : ['GObject-2.0', 'Gtk-3.0', spice_client_glib_gir[0]],
                                             identifier_prefix : 'Spice',
                                             symbol_prefix : 'spice',
                                             install : spice_gtk_has_introspection,