luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 09:16:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Meson: Fix linking of gdbus-peer test

Browse Source
This commit is contained in:
Xavier Claessens 2018-09-24 13:32:08 -04:00
parent 5c22b2ddde
commit a46f88ba1b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/tests/gdbus-object-manager-example/meson.build
View File

@ -16,10 +16,10 @@ gdbus_example_objectmanager_generated = custom_target('gdbus-example-objectmanag
libgdbus_example_objectmanager = library('gdbus-example-objectmanager', libgdbus_example_objectmanager = library('gdbus-example-objectmanager',
gdbus_example_objectmanager_generated, gdbus_example_objectmanager_generated,
c_args : gio_c_args, c_args : test_c_args,
dependencies : [libglib_dep, libgmodule_dep, libgobject_dep, libgio_dep], dependencies : [libglib_dep, libgmodule_dep, libgobject_dep, libgio_dep],
install : installed_tests_enabled, install : installed_tests_enabled,
install_dir : installed_tests_execdir) install_dir : installed_tests_execdir)
libgdbus_example_objectmanager_dep = declare_dependency(sources : gdbus_example_objectmanager_generated, libgdbus_example_objectmanager_dep = declare_dependency(
link_with : libgdbus_example_objectmanager) link_with : libgdbus_example_objectmanager)

6
gio/tests/meson.build
View File

@ -122,7 +122,10 @@ endif
if host_machine.system() != 'windows' if host_machine.system() != 'windows'
gio_tests += { gio_tests += {
'file' : {}, 'file' : {},
'gdbus-peer' : {'dependencies' : [libgdbus_example_objectmanager_dep]}, 'gdbus-peer' : {
'dependencies' : [libgdbus_example_objectmanager_dep],
'install_rpath' : installed_tests_execdir
},
'gdbus-peer-object-manager' : {}, 'gdbus-peer-object-manager' : {},
'live-g-file' : {}, 'live-g-file' : {},
'socket-address' : {}, 'socket-address' : {},
@ -471,6 +474,7 @@ foreach test_name, extra_args : gio_tests
exe = executable(test_name, [source, extra_sources], exe = executable(test_name, [source, extra_sources],
c_args : test_c_args + extra_args.get('c_args', []), c_args : test_c_args + extra_args.get('c_args', []),
dependencies : common_gio_tests_deps + extra_args.get('dependencies', []), dependencies : common_gio_tests_deps + extra_args.get('dependencies', []),
install_rpath : extra_args.get('install_rpath', ''),
install_dir: installed_tests_execdir, install_dir: installed_tests_execdir,
install: install, install: install,
) )