mirror of
https://github.com/brl/mutter.git
synced 2024-11-25 09:30:45 -05:00
build: Support sysprof-6
Sysprof 45 changed the API version of the main library. We mainly depend on sysprof-capture which is *not* affected, except for looking up the datadir where sysprof's D-Bus interfaces are installed. That lookup doesn't care whether we are using sysprof-6 or sysprof-4, so accept either dependency. https://gitlab.gnome.org/GNOME/mutter/-/issues/2962 Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3187>
This commit is contained in:
parent
45704a2b31
commit
06606b0b8e
@ -436,7 +436,7 @@ if have_profiler
|
|||||||
)
|
)
|
||||||
|
|
||||||
if libsysprof_capture_dep.type_name() == 'pkgconfig'
|
if libsysprof_capture_dep.type_name() == 'pkgconfig'
|
||||||
sysprof_dep = dependency('sysprof-4')
|
sysprof_dep = dependency('sysprof-6', 'sysprof-4')
|
||||||
sysprof_dbus_interfaces_dir = sysprof_dep.get_variable('datadir') / 'dbus-1' / 'interfaces'
|
sysprof_dbus_interfaces_dir = sysprof_dep.get_variable('datadir') / 'dbus-1' / 'interfaces'
|
||||||
else
|
else
|
||||||
sysprof_dbus_interfaces_dir = mutter_srcdir / 'subprojects' / 'sysprof' / 'src'
|
sysprof_dbus_interfaces_dir = mutter_srcdir / 'subprojects' / 'sysprof' / 'src'
|
||||||
|
Loading…
Reference in New Issue
Block a user