[libsoup] meson: Don't install soup-tests resources
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup] meson: Don't install soup-tests resources
- Date: Tue, 17 Apr 2018 08:50:03 +0000 (UTC)
commit bc489c3d3ca7bc1797ffed7f043ec13c56c1639c
Author: Jan Alexander Steffens (heftig) <jan steffens gmail com>
Date: Fri Apr 13 20:56:05 2018 +0200
meson: Don't install soup-tests resources
This was installed into the builddir on 'ninja install', especially
noticable if DESTDIR was set for packaging.
https://bugzilla.gnome.org/show_bug.cgi?id=782410
tests/meson.build | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/tests/meson.build b/tests/meson.build
index 6c4751c..7c3776c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -8,6 +8,10 @@ else
dependencies : [glib_dep, libsoup_dep])
endif
+test_resources = gnome.compile_resources('soup-tests',
+ 'soup-tests.gresource.xml',
+ gresource_bundle : true)
+
# ['name', is_parallel]
tests = [
['auth', false],
@@ -59,8 +63,9 @@ env.set('MALLOC_PERTURB_', '')
foreach test: tests
test_name = '@0@-test'.format(test[0])
- test_target = executable(test_name, test_name + '.c',
- link_with: test_utils,
+ test_target = executable(test_name,
+ sources : [ test_name + '.c', test_resources ],
+ link_with : test_utils,
dependencies : [glib_dep, libsoup_dep, platform_deps])
test(test_name, test_target, env : env, is_parallel : test[1])
endforeach
@@ -92,9 +97,3 @@ configure_file(input : 'test-key.pem',
configure_file(input : 'xmlrpc-server.php',
output : 'xmlrpc-server.php',
configuration : configuration_data())
-
-gnome.compile_resources('soup-tests',
- 'soup-tests.gresource.xml',
- gresource_bundle : true,
- install : true,
- install_dir : meson.current_build_dir() + '/tests')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]