Use Meson 0.55 provides instead of fallback

This commit is contained in:
Robbert van der Helm 2021-11-11 03:37:49 +01:00
parent 488e81c93c
commit 7bdcdb6eff
4 changed files with 12 additions and 3 deletions

View File

@ -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')

View File

@ -4,3 +4,6 @@ url = https://github.com/fraillt/bitsery.git
revision = c0fc083c9de805e5825d7553507569febf6a6f93
depth = 1
patch_directory = bitsery
[provide]
bitsery = bitsery_dep

View File

@ -4,3 +4,6 @@ url = https://github.com/Naios/function2.git
revision = 02ca99831de59c7c3a4b834789260253cace0ced
depth = 1
patch_directory = function2
[provide]
function2 = function2_dep

View File

@ -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