fdo-mirrors/wayland-protocols
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland-protocols.git synced 2025-12-28 12:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'scanner-dep' into 'main'

Browse source 
build: Make wayland-scanner optional

See merge request wayland/wayland-protocols!457
This commit is contained in:
Loïc Yhuel 2025-12-13 07:15:11 +00:00
commit a98a577932
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
meson.build
View file

@ -9,11 +9,14 @@ wayland_protocols_version = meson.project_version()
fs = import('fs')
dep_scanner = dependency('wayland-scanner',
version: get_option('tests') ? '>=1.23.0' : '>=1.20.0',
version: get_option('tests') ? '>=1.23.0' : '>=1.22.90',
required: get_option('tests'),
native: true,
fallback: 'wayland'
)
prog_scanner = find_program(dep_scanner.get_variable(pkgconfig: 'wayland_scanner', internal: 'wayland_scanner'))
if dep_scanner.found()
prog_scanner = find_program(dep_scanner.get_variable(pkgconfig: 'wayland_scanner', internal: 'wayland_scanner'))
endif
stable_protocols = {
'linux-dmabuf': ['v1'],
@ -153,7 +156,7 @@ endforeach
include_dirs = []
headers = []
if dep_scanner.version().version_compare('>=1.22.90')
if dep_scanner.found()
subdir('include/wayland-protocols')
include_dirs = ['include']
endif