diff options
| author |  Simon Ser <contact@emersion.fr> | 2022-11-25 10:46:00 +0100 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2022-11-26 10:29:58 +0100 |
| commit | ceece558504a63f5599f4c92d2009963cd502d24 (patch) | |
| tree | 37eb95aeb8f5cc217de902258bf90bb0c9ba6472 | |
| parent | Use shm_open instead of mkstemp (diff) | |
| download | sway-ceece558504a63f5599f4c92d2009963cd502d24.tar.gz sway-ceece558504a63f5599f4c92d2009963cd502d24.tar.zst sway-ceece558504a63f5599f4c92d2009963cd502d24.zip | |
build: drop wayland-scanner fallback
(cherry picked from commit 366f6ef3d31688631dc453028e108f98a1d7ab57)
| -rw-r--r-- | protocols/meson.build | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/protocols/meson.build b/protocols/meson.build index f18ab6f4..bc5c35fd 100644 --- a/protocols/meson.build +++ b/protocols/meson.build | |||
| @@ -1,14 +1,10 @@ | |||
| 1 | wl_protocol_dir = wayland_protos.get_variable('pkgdatadir') | 1 | wl_protocol_dir = wayland_protos.get_variable('pkgdatadir') |
| 2 | 2 | ||
| 3 | wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true) | 3 | wayland_scanner_dep = dependency('wayland-scanner', native: true) |
| 4 | if wayland_scanner_dep.found() | 4 | wayland_scanner = find_program( |
| 5 | wayland_scanner = find_program( | 5 | wayland_scanner_dep.get_variable(pkgconfig: 'wayland_scanner'), |
| 6 | wayland_scanner_dep.get_variable(pkgconfig: 'wayland_scanner'), | 6 | native: true, |
| 7 | native: true, | 7 | ) |
| 8 | ) | ||
| 9 | else | ||
| 10 | wayland_scanner = find_program('wayland-scanner', native: true) | ||
| 11 | endif | ||
| 12 | 8 | ||
| 13 | protocols = [ | 9 | protocols = [ |
| 14 | wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml', | 10 | wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml', |