diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2016-09-20 16:46:30 +0100 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2016-11-03 09:21:39 +0100 |
| commit | e6745141c0be19ce2aee5cf5cbcbe34ec188c1cd (patch) | |
| tree | b51d8994c0460fef65ea5fb729222bed47740ee2 | |
| parent | fc8244ab187ffc6f8c6eb814992b60d1f97929be (diff) | |
| download | gtk+-e6745141c0be19ce2aee5cf5cbcbe34ec188c1cd.tar.gz | |
meson: figure out wayland-protocols pkgdatadir via pkg-config
Instead of hardcoding the location.
| -rw-r--r-- | gdk/wayland/meson.build | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build index 85cac8bb04..6783ecf193 100644 --- a/gdk/wayland/meson.build +++ b/gdk/wayland/meson.build @@ -1,8 +1,13 @@ if wayland_enabled - #TODO: This should come from pkg-config --variable=pkgdatadir wayland-protocols - wayland_protocols_datadir = '/home/baedert/Source/gnome-configure/share/wayland-protocols/' + runcmd = run_command('pkg-config', '--variable=pkgdatadir', 'wayland-protocols') + if runcmd.returncode() == 0 + wayland_protocols_datadir = runcmd.stdout().strip() + '/' + else + error('Could not get wayland-protocols pkgdatadir via pkg-config.') + endif + wayland_scanner = find_program('wayland-scanner') genprotocols = find_program('genprotocolfiles.py') |