[gnome-builder] meson-build: Fix building jsonrpc-glib



commit 2b6bc993d87e50198559200985316121b06e2e6d
Author: Patrick Griffis <tingping tingping se>
Date:   Sun Mar 19 00:18:25 2017 -0400

    meson-build: Fix building jsonrpc-glib

 contrib/jsonrpc-glib/meson.build |   15 ++++++++++++++-
 libide/meson.build               |    2 +-
 meson.build                      |    1 +
 3 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/contrib/jsonrpc-glib/meson.build b/contrib/jsonrpc-glib/meson.build
index 83dad16..64ef717 100644
--- a/contrib/jsonrpc-glib/meson.build
+++ b/contrib/jsonrpc-glib/meson.build
@@ -24,11 +24,12 @@ configure_file(
 )
 
 libjsonrpc_private_sources = [
-  'jcon.c',
+  'jsonrpc-message.c',
 ]
 
 libjsonrpc_deps = [
   libjson_glib_dep,
+  libgiounix_dep,
 ]
 
 libjsonrpc = shared_library('jsonrpc-glib-' + libjsonrpc_api_version,
@@ -45,6 +46,18 @@ libjsonrpc_dep = declare_dependency(
   include_directories: include_directories('.'),
 )
 
+test('jsonrpc-test-message', executable('test-message', 'test-message.c',
+  dependencies: [libjsonrpc_deps, libjsonrpc_dep]
+))
+
+test('jsonrpc-test-server', executable('test-server', 'test-server.c',
+  dependencies: [libjsonrpc_deps, libjsonrpc_dep]
+))
+
+test('jsonrpc-test-stress', executable('test-stress', 'test-stress.c',
+  dependencies: [libjsonrpc_deps, libjsonrpc_dep]
+))
+
 if get_option('with_introspection')
 
   libjsonrpc_gir = gnome.generate_gir(libjsonrpc,
diff --git a/libide/meson.build b/libide/meson.build
index 677d614..2326011 100644
--- a/libide/meson.build
+++ b/libide/meson.build
@@ -603,12 +603,12 @@ libide_sources = libide_generated_headers + libide_public_sources + [
 libgtksource_dep = dependency('gtksourceview-3.0', version: '>= 3.22.0')
 
 libide_deps = [
-  dependency('gio-unix-2.0'),
   dependency('pangoft2', version: '>= 1.38.0'),
   dependency('gspell-1', version: '>= 1.2.0'),
   dependency('enchant'),
   libgtksource_dep,
   libgio_dep,
+  libgiounix_dep,
   libgtk_dep,
   libpeas_dep,
   libegg_dep,
diff --git a/meson.build b/meson.build
index 86205ac..511da29 100644
--- a/meson.build
+++ b/meson.build
@@ -120,6 +120,7 @@ configure_file(
 
 # Commonly used deps
 libgio_dep = dependency('gio-2.0', version: '>= 2.50.0')
+libgiounix_dep = dependency('gio-unix-2.0')
 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)


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