mirror of
https://github.com/brl/mutter.git
synced 2024-11-08 23:16:20 -05:00
build: Stop using source_root()/build_root()
They were deprecated in meson 0.56. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1957>
This commit is contained in:
parent
77f468e391
commit
6288763671
@ -7,7 +7,7 @@ custom_target('mutter.desktop',
|
||||
msgfmt,
|
||||
'--desktop', '--template',
|
||||
'@INPUT@',
|
||||
'-d', join_paths(meson.source_root(), 'po'),
|
||||
'-d', join_paths(mutter_srcdir, 'po'),
|
||||
'-o', '@OUTPUT@'
|
||||
],
|
||||
install: true,
|
||||
|
@ -11,6 +11,9 @@ split_version = meson.project_version().split('.')
|
||||
api_version = split_version[0].to_int() - 32
|
||||
libmutter_api_version = '@0@'.format(api_version)
|
||||
|
||||
mutter_srcdir = meson.current_source_dir()
|
||||
mutter_builddir = meson.current_build_dir()
|
||||
|
||||
# generic version requirements
|
||||
fribidi_req = '>= 1.0.0'
|
||||
glib_req = '>= 2.69.0'
|
||||
|
@ -824,7 +824,7 @@ if have_profiler
|
||||
if sysprof_dep.type_name() == 'pkgconfig'
|
||||
sysprof_dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('datadir'), 'dbus-1', 'interfaces')
|
||||
else
|
||||
sysprof_dbus_interfaces_dir = join_paths(meson.source_root(), 'subprojects', 'sysprof', 'src')
|
||||
sysprof_dbus_interfaces_dir = join_paths(mutter_srcdir, 'subprojects', 'sysprof', 'src')
|
||||
endif
|
||||
|
||||
sysprof3_dbus_file = join_paths(sysprof_dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml')
|
||||
|
@ -86,8 +86,8 @@ if have_installed_tests
|
||||
endif
|
||||
|
||||
test_env = environment()
|
||||
test_env.set('G_TEST_SRCDIR', join_paths(meson.source_root(), 'src'))
|
||||
test_env.set('G_TEST_BUILDDIR', meson.build_root())
|
||||
test_env.set('G_TEST_SRCDIR', join_paths(mutter_srcdir, 'src'))
|
||||
test_env.set('G_TEST_BUILDDIR', mutter_builddir)
|
||||
test_env.set('MUTTER_TEST_PLUGIN_PATH', '@0@'.format(default_plugin.full_path()))
|
||||
|
||||
test_client = executable('mutter-test-client',
|
||||
|
Loading…
Reference in New Issue
Block a user