From febbff72be774c0d0f29a4e270c938d51ff55206 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Wed, 2 Nov 2016 08:28:27 -0300 Subject: [PATCH] validate: Allow using json-glib as a subproject --- meson.build | 2 ++ validate/meson.build | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 1c3cac9ba0..fdb05c704a 100644 --- a/meson.build +++ b/meson.build @@ -45,6 +45,8 @@ gio_dep = dependency('gio-2.0', version: glib_req) gmodule_dep = dependency('gmodule-2.0', version: glib_req) gtk_dep = dependency('gtk+-3.0', required: false) mathlib = cc.find_library('m', required : false) +json_dep = dependency('json-glib-1.0', + fallback : ['json-glib', 'json_glib_dep']) gst_c_args = ['-DHAVE_CONFIG_H', '-DGST_USE_UNSTABLE_API'] diff --git a/validate/meson.build b/validate/meson.build index 9093a2b214..96a17d7512 100644 --- a/validate/meson.build +++ b/validate/meson.build @@ -1,6 +1,5 @@ inc_dirs = include_directories('.') -json_dep = dependency('json-glib-1.0') cdata = configuration_data() unwind_dep = dependency('libunwind', required : false)