From be3d7c79c30441affeeb0b90b483fddd093bc766 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 22 Apr 2023 22:28:24 +0300 Subject: [PATCH 15/15] Meson: Stop using deprecated get_cross_property() Use get_external_property() instead. This has also the benefit of adding support for default values. One no longer need to give all freeciv's properties, including ones completely unrelated to the build in progress, in custon cross files. See osdn #44913 Signed-off-by: Marko Lindqvist --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index e05067c6e3..b4a8246de7 100644 --- a/meson.build +++ b/meson.build @@ -108,10 +108,10 @@ else endif if meson.is_cross_build() - cross_inc_str = meson.get_cross_property('cross_inc_path') + cross_inc_str = meson.get_external_property('cross_inc_path', '') cross_inc_path = [cross_inc_str] - cross_lib_path = [meson.get_cross_property('cross_lib_path')] - crosser = meson.get_cross_property('crosser') + cross_lib_path = [meson.get_external_property('cross_lib_path', '')] + crosser = meson.get_external_property('crosser', false) else cross_inc_str = '' cross_inc_path = [] -- 2.39.2