[gnome-builder/wip/tingping/meson-build: 36/36] fixup! build: Add support for Meson
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder/wip/tingping/meson-build: 36/36] fixup! build: Add support for Meson
- Date: Fri, 21 Oct 2016 06:22:14 +0000 (UTC)
commit 15877536013068dfc5d37d5c3be5697d73507aea
Author: Patrick Griffis <tingping tingping se>
Date: Fri Oct 21 02:11:59 2016 -0400
fixup! build: Add support for Meson
contrib/gstyle/meson.build | 13 ++++++++++++-
plugins/vala-pack/meson.build | 5 +++--
2 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/contrib/gstyle/meson.build b/contrib/gstyle/meson.build
index c65266d..29ebb0c 100644
--- a/contrib/gstyle/meson.build
+++ b/contrib/gstyle/meson.build
@@ -128,7 +128,7 @@ if get_option('with_introspection')
'gstyle-xyz.c',
]
- gnome.generate_gir(libgstyle,
+ libgstyle_gir = gnome.generate_gir(libgstyle,
sources: libgstyle_introspection_sources,
nsversion: '1.0',
namespace: 'Gstyle',
@@ -143,6 +143,17 @@ if get_option('with_introspection')
],
)
+ if get_option('with_vapi')
+
+ libgstyle_vapi = gnome.generate_vapi('gstyle-private',
+ sources: libgstyle_gir[0],
+ packages: ['gio-2.0', 'gtk+-3.0', 'GtkSource-3.0'],
+ install: true,
+ install_dir: pkgvapidir,
+ )
+
+ endif
+
endif
subdir('tests')
diff --git a/plugins/vala-pack/meson.build b/plugins/vala-pack/meson.build
index 2e896f3..b16c3c1 100644
--- a/plugins/vala-pack/meson.build
+++ b/plugins/vala-pack/meson.build
@@ -70,8 +70,9 @@ vala_pack_sources = [
]
shared_library('vala-pack-plugin', vala_pack_sources,
- dependencies: [
- #libide_vapi,
+ dependencies: plugin_deps + [
+ libvala,
+ libide_vapi,
],
vala_args: [
'--pkg=posix',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]