From 2baf6ba297c126809c421b04fced4c7cc7c8d8de Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 6 May 2022 04:07:52 +0300 Subject: [PATCH 46/46] Meson: Make meson version 0.57.0 the minimum requirement See osdn #43362 Signed-off-by: Marko Lindqvist --- doc/INSTALL.meson | 2 +- meson.build | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/INSTALL.meson b/doc/INSTALL.meson index 4d707fdfee..94cf14e8ba 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 0e182151e2..b6e2df7e78 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.\n' + @@ -484,7 +484,7 @@ verhdr = custom_target('verhdr', output: 'version_gen.h', ls_core = custom_target('langstat_core', output: 'langstat_core.txt', command: [sh_exe, 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'), @@ -511,7 +511,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_exe, files('bootstrap/generate_gitrev.sh'), meson.source_root(), '@OUTPUT@'], + command: [sh_exe, files('bootstrap/generate_gitrev.sh'), + meson.project_source_root(), '@OUTPUT@'], build_by_default: get_option('gitrev')) if host_system == 'windows' -- 2.35.1