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

build: Use dbus interface dir from pkg-config

Browse Source 
Using 'datadir' breaks prefixed builds (as we look for interface files
in the prefix we are going to install to).

https://gitlab.gnome.org/GNOME/mutter/merge_requests/1094
This commit is contained in:
Arun Raghavan 2020-02-26 10:08:56 -05:00 committed by Jonas Ådahl
parent 9fa56176fd
commit 6e7316ef11
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@ -127,6 +127,7 @@ xau_dep = dependency('xau')
ice_dep = dependency('ice') ice_dep = dependency('ice')
atk_dep = dependency('atk', version: atk_req) atk_dep = dependency('atk', version: atk_req)
libcanberra_dep = dependency('libcanberra', version: libcanberra_req) libcanberra_dep = dependency('libcanberra', version: libcanberra_req)
dbus_dep = dependency('dbus-1')
# For now always require X11 support # For now always require X11 support
have_x11 = true have_x11 = true

2
src/meson.build
View File

@ -715,7 +715,7 @@ if have_profiler
'backends/meta-profiler.h', 'backends/meta-profiler.h',
] ]
dbus_interfaces_dir = join_paths(datadir, 'dbus-1', 'interfaces') dbus_interfaces_dir = dbus_dep.get_pkgconfig_variable('interfaces_dir')
sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml') sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml')
dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler', dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler',