isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 18:11:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Stop using source_root()/build_root()

Browse Source 
They were deprecated in meson 0.56.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1957>
This commit is contained in:
Florian Müllner 2021-08-05 16:18:44 +02:00 committed by Marge Bot
parent 77f468e391
commit 6288763671
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/meson.build
View File

@ -7,7 +7,7 @@ custom_target('mutter.desktop',
msgfmt, msgfmt,
'--desktop', '--template', '--desktop', '--template',
'@INPUT@', '@INPUT@',
'-d', join_paths(meson.source_root(), 'po'), '-d', join_paths(mutter_srcdir, 'po'),
'-o', '@OUTPUT@' '-o', '@OUTPUT@'
], ],
install: true, install: true,

3
meson.build
View File

@ -11,6 +11,9 @@ split_version = meson.project_version().split('.')
api_version = split_version[0].to_int() - 32 api_version = split_version[0].to_int() - 32
libmutter_api_version = '@0@'.format(api_version) libmutter_api_version = '@0@'.format(api_version)
mutter_srcdir = meson.current_source_dir()
mutter_builddir = meson.current_build_dir()
# generic version requirements # generic version requirements
fribidi_req = '>= 1.0.0' fribidi_req = '>= 1.0.0'
glib_req = '>= 2.69.0' glib_req = '>= 2.69.0'

2
src/meson.build
View File

@ -824,7 +824,7 @@ if have_profiler
if sysprof_dep.type_name() == 'pkgconfig' if sysprof_dep.type_name() == 'pkgconfig'
sysprof_dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('datadir'), 'dbus-1', 'interfaces') sysprof_dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('datadir'), 'dbus-1', 'interfaces')
else 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 endif
sysprof3_dbus_file = join_paths(sysprof_dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml') sysprof3_dbus_file = join_paths(sysprof_dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml')

4
src/tests/meson.build
View File

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