[gupnp/wip/phako/ci] build: Fix vapi include when building from subproject




commit 4e64b27717ea4c3731b4670370b857b6627c22a6
Author: Jens Georg <mail jensge org>
Date:   Sat May 22 19:29:57 2021 +0200

    build: Fix vapi include when building from subproject

 vala/meson.build | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/vala/meson.build b/vala/meson.build
index 2c4106f..aacaa71 100644
--- a/vala/meson.build
+++ b/vala/meson.build
@@ -1,5 +1,14 @@
+if gssdp_dep.type_name() == 'internal'
+    gssdp_vala_package = subproject('gssdp-1.2').get_variable('vapi')
+    gssdp_gir_dirs = subproject('gssdp-1.2').get_variable('gssdp_gir_dir')
+else
+    gssdp_vala_package = 'gssdp-1.2'
+    gssdp_gir_dirs = []
+endif
 
 gnome.generate_vapi('gupnp-1.2',
                     sources : [gir.get(0), 'gupnp-1.2-custom.vala'],
-                    packages : ['gssdp-1.2', 'gio-2.0', 'libsoup-2.4', 'libxml-2.0'],
-                    install : true)
+                    packages : [gssdp_vala_package, 'gio-2.0', 'libsoup-2.4', 'libxml-2.0'],
+                    gir_dirs : gssdp_gir_dirs,
+                    install : true
+)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]