From 95913d2a3cb423c0e64d6788c168e17e739b89e1 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 20 Dec 2018 17:44:45 +0000 Subject: [PATCH] build: Force libglib-testing to link statically MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the tests are linked to it dynamically, they won’t run without it installed system wide, which is not what we want. Signed-off-by: Philip Withnall https://phabricator.endlessm.com/T24004 --- meson.build | 5 ++++- subprojects/libglib-testing | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 61dc8f2..ee8667e 100644 --- a/meson.build +++ b/meson.build @@ -34,7 +34,10 @@ polkitpolicydir = polkit_gobject.get_pkgconfig_variable('policydir', define_variable: ['prefix', prefix]) libglib_testing = subproject('libglib-testing') -libglib_testing_dep = libglib_testing.get_variable('libglib_testing_dep') +libglib_testing_dep = dependency( + 'libglib-testing', + fallback: ['libglib-testing', 'libglib_testing_dep'], +) config_h = configuration_data() config_h.set_quoted('GETTEXT_PACKAGE', meson.project_name()) diff --git a/subprojects/libglib-testing b/subprojects/libglib-testing index a2ec203..412c706 160000 --- a/subprojects/libglib-testing +++ b/subprojects/libglib-testing @@ -1 +1 @@ -Subproject commit a2ec2038047588fe5fe722e5e27e9551c1c6d753 +Subproject commit 412c706b51ca04a9ca873bfa495e32c47f586c84