From 60cb6984a797ec2790188f4ea81e9d6804addb9d Mon Sep 17 00:00:00 2001 From: Matt Jolly Date: Sun, 11 Jun 2023 17:21:05 +1000 Subject: [PATCH 16/16] Meson: Find system-lua in multiple places Lua doesn't have a default pkg-config (etc) and distros are fragmented. Look for it in any of its multitude of hiding places. Bump meson version so that this doesn't require a ton of boilerplate Modified by Marko Lindqvist See osdn #48234 --- doc/INSTALL.meson | 2 +- doc/README.packaging | 1 + meson.build | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/INSTALL.meson b/doc/INSTALL.meson index 3b0942f0c1..b1e2d135ea 100644 --- a/doc/INSTALL.meson +++ b/doc/INSTALL.meson @@ -16,7 +16,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.57.0. +For the meson based build minimum version of meson is 0.60.0. Overview: diff --git a/doc/README.packaging b/doc/README.packaging index a4d61dc5f8..50143ed622 100644 --- a/doc/README.packaging +++ b/doc/README.packaging @@ -21,6 +21,7 @@ Updating from 3.1 to 3.2 * Minimum SDL2 requirement for sound support is 2.0.6. * Minimum Python requirement for code generation scripts is 3.5. * Threaded AI has been dropped completely +* Minimum meson requirement for builds made with it is 0.60.0 * Meson based build is no longer considered experimental, but a supported one ---------------------------------------------------------------------- diff --git a/meson.build b/meson.build index 0cf7ba5dbd..10af7bfd9b 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ -project('freeciv', ['c', 'cpp'], meson_version: '>= 0.57.0') +project('freeciv', ['c', 'cpp'], meson_version: '>= 0.60.0') c_compiler = meson.get_compiler('c') cxx_compiler = meson.get_compiler('cpp') @@ -528,7 +528,7 @@ else endif icu_dep = dependency('icu-uc') syslua = get_option('syslua') - lua_dep_tmp = dependency('lua-5.4', required:false) + lua_dep_tmp = dependency('lua-5.4', 'lua-54', 'lua54', 'lua5.4', required:false) endif # Set unconditionally, as it was checked as hard requirement -- 2.40.1