From 4c2105312379b62dc84f6eaaf26e2ab293d51b92 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 16 Apr 2021 02:32:38 -0600 Subject: [PATCH] meson: only require cpp for tests Signed-off-by: James Hilliard [Upstream status: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/130] Signed-off-by: Adrian Perez de Castro [yann.morin.1998@free.fr: backport from upstream] Signed-off-by: Yann E. MORIN --- meson.build | 2 +- tests/meson.build | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 12b4641..cdb66bc 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project( - 'wayland', 'c', 'cpp', + 'wayland', 'c', version: '1.19.0', license: 'MIT', meson_version: '>= 0.52.1', diff --git a/tests/meson.build b/tests/meson.build index a32ac50..2e11af4 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -64,15 +64,17 @@ executable( dependencies: test_runner_dep ) -test( - 'cpp-compile-test', - executable( +if add_languages('cpp') + test( 'cpp-compile-test', - 'cpp-compile-test.cpp', - wayland_server_protocol_h, - include_directories: src_inc + executable( + 'cpp-compile-test', + 'cpp-compile-test.cpp', + wayland_server_protocol_h, + include_directories: src_inc + ) ) -) +endif sed_path = find_program('sed').path() -- 2.31.1