matteo
/
malcontent
1
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

build: Force libglib-testing to link statically 

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 <withnall@endlessm.com>

https://phabricator.endlessm.com/T24004
This commit is contained in:
Philip Withnall 2018-12-20 17:44:45 +00:00
parent 58fc42f805
commit 95913d2a3c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -34,7 +34,10 @@ polkitpolicydir = polkit_gobject.get_pkgconfig_variable('policydir',
define_variable: ['prefix', prefix]) define_variable: ['prefix', prefix])
libglib_testing = subproject('libglib-testing') 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 = configuration_data()
config_h.set_quoted('GETTEXT_PACKAGE', meson.project_name()) config_h.set_quoted('GETTEXT_PACKAGE', meson.project_name())

2
subprojects/libglib-testing

@ -1 +1 @@
Subproject commit a2ec2038047588fe5fe722e5e27e9551c1c6d753 Subproject commit 412c706b51ca04a9ca873bfa495e32c47f586c84