From 7bdcdb6eff942ab8e100ae2bf152d985bd0f543d Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Thu, 11 Nov 2021 03:37:49 +0100 Subject: [PATCH] Use Meson 0.55 provides instead of fallback --- meson.build | 6 +++--- subprojects/bitsery.wrap | 3 +++ subprojects/function2.wrap | 3 +++ subprojects/tomlplusplus.wrap | 3 +++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index cd533063..6e21dac7 100644 --- a/meson.build +++ b/meson.build @@ -226,10 +226,10 @@ endif # and 64-bit versions boost_dep = dependency('boost', version : '>=1.66', static : with_static_boost) -bitsery_dep = dependency('bitsery', version : '>=5.2.0', fallback : ['bitsery', 'bitsery_dep']) -function2_dep = dependency('function2', version : '>=4.2.0', fallback : ['function2', 'function2_dep']) +bitsery_dep = dependency('bitsery', version : '>=5.2.0') +function2_dep = dependency('function2', version : '>=4.2.0') threads_dep = dependency('threads') -tomlplusplus_dep = dependency('tomlplusplus', version : '>=2.5.0', fallback : ['tomlplusplus', 'tomlplusplus_dep']) +tomlplusplus_dep = dependency('tomlplusplus', version : '>=2.5.0') dl_dep = declare_dependency(link_args : '-ldl') rt_dep = declare_dependency(link_args : '-lrt') diff --git a/subprojects/bitsery.wrap b/subprojects/bitsery.wrap index 4832fb25..f7a04606 100644 --- a/subprojects/bitsery.wrap +++ b/subprojects/bitsery.wrap @@ -4,3 +4,6 @@ url = https://github.com/fraillt/bitsery.git revision = c0fc083c9de805e5825d7553507569febf6a6f93 depth = 1 patch_directory = bitsery + +[provide] +bitsery = bitsery_dep diff --git a/subprojects/function2.wrap b/subprojects/function2.wrap index 8f6867a6..1a980510 100644 --- a/subprojects/function2.wrap +++ b/subprojects/function2.wrap @@ -4,3 +4,6 @@ url = https://github.com/Naios/function2.git revision = 02ca99831de59c7c3a4b834789260253cace0ced depth = 1 patch_directory = function2 + +[provide] +function2 = function2_dep diff --git a/subprojects/tomlplusplus.wrap b/subprojects/tomlplusplus.wrap index 26fa1e86..b561fca2 100644 --- a/subprojects/tomlplusplus.wrap +++ b/subprojects/tomlplusplus.wrap @@ -3,3 +3,6 @@ url = https://github.com/marzer/tomlplusplus.git # This is tag v2.5.0 revision = 037bfdd21f794d7212616d5e6f4f8baab543c472 depth = 1 + +[provide] +tomlplusplus = tomlplusplus_dep