diff options
| author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2019-01-28 12:30:01 +0100 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2019-01-29 08:39:12 +0800 |
| commit | 10507d3fb6c678d005ef6ed241e24a0d119ca3ba (patch) | |
| tree | b018c38d4a0760679c55caa4ad48ae218d6a5dc6 | |
| parent | f139dafa59172d40543f2ec469a035d3de9fdc6a (diff) | |
| download | libva-intel-driver-10507d3fb6c678d005ef6ed241e24a0d119ca3ba.tar.gz | |
build: meson: compile without wayland support
This patch replaces the PR
https://github.com/intel/intel-vaapi-driver/pull/441
| -rw-r--r-- | meson.build | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 51bb1d09..fa0b2f2e 100644 --- a/meson.build +++ b/meson.build @@ -81,17 +81,22 @@ if get_option('with_wayland') != 'no' if wayland_client_dep.found() prefix = wayland_client_dep.get_pkgconfig_variable('prefix') - wl_scanner = find_program( - 'wayland-scanner', - join_paths(prefix, '/bin/wayland-scanner')) + wayland_scanner = join_paths(prefix, 'bin', 'wayland-scanner') + else + wayland_scanner = '' endif + wl_scanner = find_program('wayland-scanner', wayland_scanner, + required : get_option('with_wayland') == 'yes') + libva_wayland_dep = dependency( 'libva-wayland', version : libva_version, required : get_option('with_wayland') == 'yes') - WITH_WAYLAND = wl_scanner.found() and libva_wayland_dep.found() + WITH_WAYLAND = (wayland_client_dep.found() + and wl_scanner.found() + and libva_wayland_dep.found()) endif subdir('src') |