From 6f6dbf7faf8efbbc46191cbf16dfdc3727b45612 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 5 Jan 2022 02:03:04 +0200 Subject: [PATCH 29/29] Meson: Make meson version 0.57.0 the minimum requirement See osdn #43362 Signed-off-by: Marko Lindqvist --- doc/INSTALL.meson | 2 +- meson.build | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/INSTALL.meson b/doc/INSTALL.meson index a78c3444b4..1c9c6631fc 100644 --- a/doc/INSTALL.meson +++ b/doc/INSTALL.meson @@ -17,7 +17,7 @@ of the build system itself. Meson build does not need autotools, nor does autotools build need meson. See main (autotools) INSTALL file for the common prerequisites. -For the meson based build minimum version of meson is 0.48.0. +For the meson based build minimum version of meson is 0.57.0. Overview: diff --git a/meson.build b/meson.build index 6506d9cf10..8eec1344d9 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ -project('freeciv', ['c', 'cpp'], meson_version: '>= 0.48.0') +project('freeciv', ['c', 'cpp'], meson_version: '>= 0.57.0') if not get_option('ack_experimental') error('Autotools are still the only fully supported way to build freeciv.\nSet configure option "ack_experimental" to true if you really want to do experimental meson build.') @@ -439,7 +439,8 @@ verhdr = custom_target('verhdr', output: 'version_gen.h', ls_core = custom_target('langstat_core', output: 'langstat_core.txt', command: ['sh', files('bootstrap/generate_langstat.sh'), 'core', - meson.source_root(), meson.build_root()]) + meson.project_source_root(), + meson.project_build_root()]) specenum = custom_target('specenum_gen.h', output: 'specenum_gen.h', command: [python_exe, files('utility/generate_specenum.py'), @@ -463,7 +464,8 @@ pack_client = custom_target('packets_client', output: ['packhand_gen.h', depend_files: files('common/networking/packets.def')) gitrev = custom_target('gitrev', output: 'fc_gitrev_gen.h', - command: ['sh', files('bootstrap/generate_gitrev.sh'), meson.source_root(), '@OUTPUT@'], + command: ['sh', files('bootstrap/generate_gitrev.sh'), + meson.project_source_root(), '@OUTPUT@'], build_by_default: get_option('gitrev')) tolua_cmd = find_program('tolua') -- 2.34.1