Skip to content
This repository was archived by the owner on Jan 31, 2025. It is now read-only.

Commit 10507d3

Browse files
ceyusaxhaihao
authored andcommittedJan 29, 2019
build: meson: compile without wayland support
This patch replaces the PR #441
1 parent f139daf commit 10507d3

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed
 

‎meson.build

+9-4
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,22 @@ if get_option('with_wayland') != 'no'
8181

8282
if wayland_client_dep.found()
8383
prefix = wayland_client_dep.get_pkgconfig_variable('prefix')
84-
wl_scanner = find_program(
85-
'wayland-scanner',
86-
join_paths(prefix, '/bin/wayland-scanner'))
84+
wayland_scanner = join_paths(prefix, 'bin', 'wayland-scanner')
85+
else
86+
wayland_scanner = ''
8787
endif
8888

89+
wl_scanner = find_program('wayland-scanner', wayland_scanner,
90+
required : get_option('with_wayland') == 'yes')
91+
8992
libva_wayland_dep = dependency(
9093
'libva-wayland',
9194
version : libva_version,
9295
required : get_option('with_wayland') == 'yes')
9396

94-
WITH_WAYLAND = wl_scanner.found() and libva_wayland_dep.found()
97+
WITH_WAYLAND = (wayland_client_dep.found()
98+
and wl_scanner.found()
99+
and libva_wayland_dep.found())
95100
endif
96101

97102
subdir('src')

0 commit comments

Comments
 (0)
This repository has been archived.