mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-10-29 05:40:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: use strict wayland-scanner mode

Browse source 
Otherwise an invalid protocol will print warnings to stdout but won't
make the build fail.

Signed-off-by: Simon Ser <contact@emersion.fr>
This commit is contained in:
Simon Ser 2020-01-13 18:56:35 +01:00 • committed by Pekka Paalanen
parent 6ddd0636e0
commit 1f8fe8b966
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/meson.build
View file

@ -112,7 +112,7 @@ if get_option('libraries')
target = custom_target( target = custom_target(
target_name, target_name,
command: [ command: [
wayland_scanner_for_build, scanner_args, wayland_scanner_for_build, '-s', scanner_args,
'@INPUT@', '@OUTPUT@' '@INPUT@', '@OUTPUT@'
], ],
input: wayland_protocol_xml, input: wayland_protocol_xml,
@ -127,7 +127,7 @@ if get_option('libraries')
wayland_protocol_c = custom_target( wayland_protocol_c = custom_target(
'protocol source', 'protocol source',
command: [ command: [
wayland_scanner_for_build, 'public-code', '@INPUT@', '@OUTPUT@' wayland_scanner_for_build, '-s', 'public-code', '@INPUT@', '@OUTPUT@'
], ],
input: wayland_protocol_xml, input: wayland_protocol_xml,
output: 'wayland-protocol.c' output: 'wayland-protocol.c'

6
tests/meson.build
View file

@ -30,21 +30,21 @@ tests_protocol_xml = files('../protocol/tests.xml')
tests_server_protocol_h = custom_target( tests_server_protocol_h = custom_target(
'test server protocol header', '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, input: tests_protocol_xml,
output: 'tests-server-protocol.h' output: 'tests-server-protocol.h'
) )
tests_client_protocol_c = custom_target( tests_client_protocol_c = custom_target(
'test client protocol header', '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, input: tests_protocol_xml,
output: 'tests-client-protocol.h' output: 'tests-client-protocol.h'
) )
tests_protocol_c = custom_target( tests_protocol_c = custom_target(
'test protocol source', '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, input: tests_protocol_xml,
output: 'tests-protocol.c' output: 'tests-protocol.c'
) )