From 31bdfa873327b362c9dd4818c2ffa6b63cb5fddf Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sat, 5 Feb 2022 20:20:24 +0200
Subject: [PATCH 42/42] Meson: Clean up setting global arguments to both c and
c++ compilations
See osdn #43400
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
meson.build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/meson.build b/meson.build
index 4dbf87355a..21feb5b093 100644
--- a/meson.build
+++ b/meson.build
@@ -38,8 +38,7 @@ endif
if get_option('debug')
priv_conf_data.set('FREECIV_DEBUG', 1)
pub_conf_data.set('FREECIV_DEBUG', 1)
- add_global_arguments('-Werror', language: 'c')
- add_global_arguments('-Werror', language: 'cpp')
+ add_global_arguments('-Werror', language: ['c', 'cpp'])
else
add_global_arguments('-DQT_NO_DEBUG', language : 'cpp')
endif
@@ -422,9 +421,7 @@ configure_file(input : 'gen_headers/meson_liblua_config.h.in',
configuration: liblua_conf_data)
add_global_arguments('-DHAVE_CONFIG_H',
- language: 'c')
-add_global_arguments('-DHAVE_CONFIG_H',
- language: 'cpp')
+ language: ['c', 'cpp'])
if get_option('nls')
subdir('translations/core')
--
2.34.1