[gnome-builder] build: Install bundled libdazzle into private directory
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: Install bundled libdazzle into private directory
- Date: Fri, 9 Jun 2017 22:21:22 +0000 (UTC)
commit 52c4619ce4004a973a3d7de77af94262137b8c51
Author: Patrick Griffis <tingping tingping se>
Date: Fri Jun 9 18:20:33 2017 -0400
build: Install bundled libdazzle into private directory
meson.build | 5 ++++-
plugins/vala-pack/meson.build | 17 ++++++++++++-----
subprojects/libdazzle | 2 +-
3 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/meson.build b/meson.build
index 11da5dc..09e359f 100644
--- a/meson.build
+++ b/meson.build
@@ -159,16 +159,19 @@ endif
libdazzle_gir = 'Dazzle-1.0'
libdazzle_vapi = 'libdazzle-1.0'
+libdazzle_bundled = false
if not libdazzle_dep.found()
libdazzle = subproject('libdazzle',
default_options: [
'with_introspection=true',
- 'with_vapi=true'
+ 'with_vapi=true',
+ 'package_subdir=' + meson.project_name()
]
)
libdazzle_dep = libdazzle.get_variable('libdazzle_dep')
libdazzle_gir = libdazzle.get_variable('libdazzle_gir')[0]
libdazzle_vapi = libdazzle.get_variable('libdazzle_vapi')
+ libdazzle_bundled = true
endif
diff --git a/plugins/vala-pack/meson.build b/plugins/vala-pack/meson.build
index f6d9576..97b91f6 100644
--- a/plugins/vala-pack/meson.build
+++ b/plugins/vala-pack/meson.build
@@ -70,15 +70,22 @@ vala_pack_sources = [
'vala-pack-plugin.vala',
]
+vala_pack_deps = [
+ libvala,
+ libide_vapi,
+]
+
+if libdazzle_bundled
+ vala_pack_deps += libdazzle_vapi
+else
+ vala_extra_args += '--pkg=libdazzle-1.0'
+endif
+
shared_module('vala-pack-plugin', vala_pack_sources,
- dependencies: plugin_deps + [
- libvala,
- libide_vapi,
- ],
+ dependencies: plugin_deps + vala_pack_deps,
vala_args: [
'--target-glib=2.52',
'--pkg=posix',
- '--pkg=libdazzle-1.0',
'--pkg=libpeas-1.0',
'--pkg=gtksourceview-3.0',
'--pkg=gio-2.0',
diff --git a/subprojects/libdazzle b/subprojects/libdazzle
index 9016efd..18d2c7e 160000
--- a/subprojects/libdazzle
+++ b/subprojects/libdazzle
@@ -1 +1 @@
-Subproject commit 9016efdceec3c939608a02f736e91c42f24b7429
+Subproject commit 18d2c7ed69c07712650f38f165360ca82e14df92
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]