From 4cbcf79a8479bba9b13b6e5324dad568815e1d7d Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Sun, 19 Dec 2021 21:08:09 +0100 Subject: [PATCH] Don't check capitalized bitsery dep on Meson <0.60 This was added in Meson 0.60, but at the moment it's not worth bumping the minimum Meson version over. --- meson.build | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index c594d85c..af1eac26 100644 --- a/meson.build +++ b/meson.build @@ -228,8 +228,16 @@ endif # and 64-bit versions boost_dep = dependency('boost', version : '>=1.66', static : with_static_boost) -# Bitsery's CMake build definition is capitalized for some reason -bitsery_dep = dependency('bitsery', 'Bitsery', version : '>=5.2.0') +if meson.version().version_compare('>=0.60') + # Bitsery's CMake build definition is capitalized for some reason + bitsery_dep = dependency('bitsery', 'Bitsery', version : '>=5.2.0') +else + # Mmeson <=0.6.0 didn't support multiple names for a dependency, and since at + # the moment this is only relevant for packing on Arch btw, it's probably + # better to remove this conditional later than it is to bump the minimum Meson + # version now. + bitsery_dep = dependency('bitsery', version : '>=5.2.0') +endif function2_dep = dependency('function2', version : '>=4.0.0') threads_dep = dependency('threads') tomlplusplus_dep = dependency('tomlplusplus', version : '>=2.0.0')