[gnome-builder] build: Install bundled jsonrpc-glib into private directories



commit 2befd7553c554e7035e99944ee536aa74f4273a7
Author: Patrick Griffis <tingping tingping se>
Date:   Fri Jun 9 18:49:48 2017 -0400

    build: Install bundled jsonrpc-glib into private directories

 meson.build              |    7 ++++++-
 subprojects/jsonrpc-glib |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 7a349f1..3de4818 100644
--- a/meson.build
+++ b/meson.build
@@ -135,7 +135,12 @@ libjson_glib_dep = dependency('json-glib-1.0', version: '>= 1.2.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']
+  fallback: ['jsonrpc-glib', 'libjsonrpc_glib_dep'],
+  default_options: [
+    'with_introspection=false',
+    'with_vapi=false',
+    'package_subdir=' + meson.project_name()
+  ],
 )
 
 libtemplate_glib_gir = 'Template-1.0'
diff --git a/subprojects/jsonrpc-glib b/subprojects/jsonrpc-glib
index 21810e6..c1d404f 160000
--- a/subprojects/jsonrpc-glib
+++ b/subprojects/jsonrpc-glib
@@ -1 +1 @@
-Subproject commit 21810e6cbb88e586d432f424e9d72e124563ff99
+Subproject commit c1d404fa8addd2ae22bee30dcd541396d31d5b4e


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