summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2020-01-13 18:56:35 +0100
committerPekka Paalanen <pq@iki.fi>2020-01-15 13:26:20 +0000
commit1f8fe8b966b59cd8af22c6a4a3b81996ff057c22 (patch)
treeb3a4d6c76bbfd6a8aa1f1249b4e89c718971018f
parenttests: Ensure that overflow test always overflows (diff)
downloadwayland-1f8fe8b966b59cd8af22c6a4a3b81996ff057c22.tar
wayland-1f8fe8b966b59cd8af22c6a4a3b81996ff057c22.tar.gz
wayland-1f8fe8b966b59cd8af22c6a4a3b81996ff057c22.tar.bz2
wayland-1f8fe8b966b59cd8af22c6a4a3b81996ff057c22.tar.lz
wayland-1f8fe8b966b59cd8af22c6a4a3b81996ff057c22.tar.xz
wayland-1f8fe8b966b59cd8af22c6a4a3b81996ff057c22.tar.zst
wayland-1f8fe8b966b59cd8af22c6a4a3b81996ff057c22.zip
meson: use strict wayland-scanner mode
Otherwise an invalid protocol will print warnings to stdout but won't make the build fail. Signed-off-by: Simon Ser <contact@emersion.fr>
-rw-r--r--src/meson.build4
-rw-r--r--tests/meson.build6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/meson.build b/src/meson.build
index 26e5269..7945965 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -112,7 +112,7 @@ if get_option('libraries')
target = custom_target(
target_name,
command: [
- wayland_scanner_for_build, scanner_args,
+ wayland_scanner_for_build, '-s', scanner_args,
'@INPUT@', '@OUTPUT@'
],
input: wayland_protocol_xml,
@@ -127,7 +127,7 @@ if get_option('libraries')
wayland_protocol_c = custom_target(
'protocol source',
command: [
- wayland_scanner_for_build, 'public-code', '@INPUT@', '@OUTPUT@'
+ wayland_scanner_for_build, '-s', 'public-code', '@INPUT@', '@OUTPUT@'
],
input: wayland_protocol_xml,
output: 'wayland-protocol.c'
diff --git a/tests/meson.build b/tests/meson.build
index 6daec2e..c28a2a3 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -30,21 +30,21 @@ tests_protocol_xml = files('../protocol/tests.xml')
tests_server_protocol_h = custom_target(
'test server protocol header',
- command: [ wayland_scanner_for_build, 'server-header', '@INPUT@', '@OUTPUT@' ],
+ command: [ wayland_scanner_for_build, '-s', 'server-header', '@INPUT@', '@OUTPUT@' ],
input: tests_protocol_xml,
output: 'tests-server-protocol.h'
)
tests_client_protocol_c = custom_target(
'test client protocol header',
- command: [ wayland_scanner_for_build, 'client-header', '@INPUT@', '@OUTPUT@' ],
+ command: [ wayland_scanner_for_build, '-s', 'client-header', '@INPUT@', '@OUTPUT@' ],
input: tests_protocol_xml,
output: 'tests-client-protocol.h'
)
tests_protocol_c = custom_target(
'test protocol source',
- command: [ wayland_scanner_for_build, 'public-code', '@INPUT@', '@OUTPUT@' ],
+ command: [ wayland_scanner_for_build, '-s', 'public-code', '@INPUT@', '@OUTPUT@' ],
input: tests_protocol_xml,
output: 'tests-protocol.c'
)