[gnome-builder] build: Fallback to bundled libdazzle
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: Fallback to bundled libdazzle
- Date: Tue, 6 Jun 2017 21:04:17 +0000 (UTC)
commit 7b291389ed31def4e167ce5a9c90bc2c905b73ae
Author: Patrick Griffis <tingping tingping se>
Date: Tue Jun 6 17:01:56 2017 -0400
build: Fallback to bundled libdazzle
.gitmodules | 3 +++
libide/meson.build | 4 ++--
meson.build | 17 ++++++++++++++++-
subprojects/libdazzle | 1 +
4 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index c314dcf..2adef65 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
[submodule "subprojects/template-glib"]
path = subprojects/template-glib
url = https://git.gnome.org/browse/template-glib
+[submodule "subprojects/libdazzle"]
+ path = subprojects/libdazzle
+ url = https://git.gnome.org/browse/libdazzle
diff --git a/libide/meson.build b/libide/meson.build
index 33d8d8d..f99fab1 100644
--- a/libide/meson.build
+++ b/libide/meson.build
@@ -702,7 +702,7 @@ if get_option('with_introspection')
namespace: 'Ide',
symbol_prefix: 'ide',
identifier_prefix: 'Ide',
- includes: [ 'Gio-2.0', 'GtkSource-3.0', 'Peas-1.0', 'Dazzle-1.0', 'Json-1.0',
libtemplate_glib_gir ],
+ includes: [ 'Gio-2.0', 'GtkSource-3.0', 'Peas-1.0', libdazzle_gir, 'Json-1.0',
libtemplate_glib_gir ],
install: true,
install_dir_gir: pkggirdir,
install_dir_typelib: pkgtypelibdir,
@@ -728,7 +728,7 @@ if get_option('with_introspection')
'gtk+-3.0',
'gtksourceview-3.0',
'json-glib-1.0',
- 'libdazzle-1.0',
+ libdazzle_vapi,
'libpeas-1.0',
libtemplate_glib_vapi,
],
diff --git a/meson.build b/meson.build
index 84ddffa..fcde6b5 100644
--- a/meson.build
+++ b/meson.build
@@ -131,7 +131,7 @@ libgtk_dep = dependency('gtk+-3.0', version: '>= 3.22.1')
libpeas_dep = dependency('libpeas-1.0', version: '>= 1.18.0')
libm_dep = cc.find_library('m', required: false)
libjson_glib_dep = dependency('json-glib-1.0', version: '>= 1.2.0')
-libdazzle_dep = dependency('libdazzle-1.0', version: '>= 0.1.0')
+libdazzle_dep = dependency('libdazzle-1.0', version: '>= 0.1.0', required: false)
libtemplate_glib_dep = dependency('template-glib-1.0', version: '>= 3.25.2', required: false)
libjsonrpc_glib_dep = dependency('jsonrpc-glib-1.0', version: '>= 3.25.2',
fallback: ['jsonrpc-glib', 'libjsonrpc_glib_dep']
@@ -151,6 +151,21 @@ if not libtemplate_glib_dep.found()
libtemplate_glib_vapi = libtemplate_glib.get_variable('libtemplate_glib_vapi')
endif
+libdazzle_gir = 'Dazzle-1.0'
+libdazzle_vapi = 'libdazzle-1.0'
+if not libdazzle_dep.found()
+ libdazzle = subproject('libdazzle',
+ default_options: [
+ 'with_introspection=true',
+ 'with_vapi=true'
+ ]
+ )
+ libdazzle_dep = libdazzle.get_variable('libdazzle_dep')
+ libdazzle_gir = libdazzle.get_variable('libdazzle_gir')[0]
+ libdazzle_vapi = libdazzle.get_variable('libdazzle_vapi')
+endif
+
+
libgd = subproject('libgd',
default_options: [
'static=false',
diff --git a/subprojects/libdazzle b/subprojects/libdazzle
new file mode 160000
index 0000000..9016efd
--- /dev/null
+++ b/subprojects/libdazzle
@@ -0,0 +1 @@
+Subproject commit 9016efdceec3c939608a02f736e91c42f24b7429
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]