[gnome-contacts/wip/nielsdg/fix-subproject-build] build: fix build when using handy as subproject



commit b318efa03834e98a4e2cb28e66a2d1dfdf463809
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Wed Jan 16 23:15:57 2019 +0100

    build: fix build when using handy as subproject
    
    When using libhandy as a subproject, we use its `libhandy_dep` variable,
    which doesn't contain the VAPI. Normally, this would be handled by
    pkg-config, but since that's not used here, make sure we add it
    ourselves.

 meson.build | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index 8a20138..c0eb28f 100644
--- a/meson.build
+++ b/meson.build
@@ -73,7 +73,13 @@ if not libhandy.found()
       'tests=false',
     ]
   )
-  libhandy = libhandy_subproj.get_variable('libhandy_dep')
+  # When using libhandy as subproject, make sure we get the VAPI file
+  libhandy = declare_dependency(
+    dependencies: [
+      libhandy_subproj.get_variable('libhandy_dep'),
+      libhandy_subproj.get_variable('libhandy_vapi'),
+    ]
+  )
 endif
 
 valadoc = find_program('valadoc', required: docs_enabled)


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