From: Simon Ser <contact@emersion.fr>
Date: Mon, 13 Jan 2020 17:56:35 +0000 (+0100)
Subject: meson: use strict wayland-scanner mode
X-Git-Tag: 1.17.91~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f8fe8b966b59cd8af22c6a4a3b81996ff057c22;p=platform%2Fupstream%2Fwayland.git

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>
---

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'
 )