isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-19 19:44:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: Define srcdir and builddir using meson functions

Browse Source 
No need to redefine paths starting from top src/build dirs, as meson can give us
this information for free using its functions.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/442
This commit is contained in:
Marco Trevisan (Treviño)
2019-04-04 22:35:44 -04:00
committed by Marco Trevisan
parent 8374be46d2
commit 63c40a9711
9 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/meson.build
View File

@ -639,7 +639,7 @@ if have_native_backend
'--interface-prefix', 'org.freedesktop.login1',
'--c-namespace', 'Login1',
'--generate-c-code', 'meta-dbus-login1',
'--output-directory', join_paths(builddir, 'src'),
'--output-directory', meson.current_build_dir(),
'--c-generate-autocleanup', 'all',
'@INPUT@',
]

4
src/tests/meson.build
View File

@ -27,8 +27,8 @@ if have_installed_tests
endif
test_env = environment()
test_env.set('G_TEST_SRCDIR', join_paths(top_srcdir, 'src'))
test_env.set('G_TEST_BUILDDIR', builddir)
test_env.set('G_TEST_SRCDIR', join_paths(meson.source_root(), 'src'))
test_env.set('G_TEST_BUILDDIR', meson.build_root())
test_env.set('MUTTER_TEST_PLUGIN_PATH', '@0@'.format(default_plugin.full_path()))
test_client = executable('mutter-test-client',