♻ update deps

This commit is contained in:
Vladislav Nepogodin 2022-06-07 22:47:05 +04:00
parent ad0ff2b336
commit 6819f6933d
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
8 changed files with 37 additions and 13 deletions

1
.gitignore vendored
View File

@ -13,6 +13,7 @@ subprojects/ftxui
subprojects/nlohmann_json-*
subprojects/spdlog
subprojects/simdjson
subprojects/range-v3
subprojects/packagecache
# Prerequisites

View File

@ -38,7 +38,7 @@ fmt = dependency('fmt', version : ['>=8.0.0'], fallback : ['fmt', 'fmt_dep'])
ftxui = dependency('ftxui', modules : ['ftxui::screen', 'ftxui::dom', 'ftxui::component'], fallback : ['ftxui', 'ftxui_dep'])
simdjson = dependency('simdjson', version : ['>=1.0.2'], fallback : ['simdjson', 'simdjson_dep'])
cpr = dependency('cpr', version : ['>=1.7.0'], fallback : ['cpr', 'cpr_dep'])
ranges = dependency('range-v3', version : ['>=0.11.0'])
ranges = dependency('range-v3', version : ['>=0.11.0'], fallback : ['range-v3', 'range_dep'])
#glibmm = dependency('glibmm-2.4', version : ['>=2.56.0'])
src_files = files(

View File

@ -1,7 +1,7 @@
project('cpr', 'cpp',
version: '1.7.2',
version: '1.8.3',
license : 'MIT',
default_options: ['cpp_std=c++11']
default_options: ['cpp_std=c++20']
)
curl_dep = dependency('libcurl', required : true)
@ -10,6 +10,7 @@ src_inc = include_directories('.')
cpr_inc = include_directories('include')
cpr_lib = static_library('cpr',
sources : [
'cpr/async.cpp',
'cpr/auth.cpp',
'cpr/bearer.cpp',
'cpr/cookies.cpp',
@ -23,11 +24,14 @@ cpr_lib = static_library('cpr',
'cpr/proxies.cpp',
'cpr/proxyauth.cpp',
'cpr/session.cpp',
'cpr/threadpool.cpp',
'cpr/timeout.cpp',
'cpr/unix_socket.cpp',
'cpr/util.cpp',
'cpr/response.cpp',
'cpr/redirect.cpp'
'cpr/redirect.cpp',
'cpr/interceptor.cpp',
'cpr/ssl_ctx.cpp'
],
include_directories : [cpr_inc, src_inc],
dependencies : [curl_dep]

View File

@ -6,6 +6,7 @@ project('ftxui', 'cpp',
cpp = meson.get_compiler('cpp')
thread_dep = dependency('threads')
ranges = dependency('range-v3', version : ['>=0.11.0'], fallback : ['range-v3', 'range_dep'])
ftxui_inc = include_directories('include')
ftxui_priv_inc = include_directories('src')
@ -21,7 +22,8 @@ ftxui_screen_lib = static_library('ftxui_screen',
'include/ftxui/screen/screen.hpp',
'include/ftxui/screen/string.hpp'
],
include_directories : ftxui_inc
include_directories : ftxui_inc,
dependencies : [thread_dep, ranges]
)
ftxui_dom_lib = static_library('ftxui_dom',
@ -70,7 +72,8 @@ ftxui_dom_lib = static_library('ftxui_dom',
'src/ftxui/dom/vbox.cpp'
],
include_directories : [ftxui_inc, ftxui_priv_inc],
link_with : [ftxui_screen_lib]
link_with : [ftxui_screen_lib],
dependencies : [thread_dep, ranges]
)
ftxui_component_lib = static_library('ftxui_component',
@ -109,7 +112,7 @@ ftxui_component_lib = static_library('ftxui_component',
],
include_directories : [ftxui_inc, ftxui_priv_inc],
link_with : [ftxui_dom_lib],
dependencies : [thread_dep]
dependencies : [thread_dep, ranges]
)
ftxui_dep = declare_dependency(

View File

@ -0,0 +1,8 @@
project('range-v3', 'cpp', version: '0.11.0',
license: 'Boost, libc++, Stepanov and McJones "Elements of Programming", SGI STL')
range_inc = include_directories('include')
range_dep = declare_dependency(
include_directories : range_inc
)

View File

@ -2,7 +2,7 @@ project('simdjson', 'cpp',
version : '1.0.2',
license : 'Apache-2.0',
default_options : [
'cpp_std=c++17',
'cpp_std=c++20',
'default_library=static',
]
)

View File

@ -1,11 +1,11 @@
project('spdlog', 'cpp', version : '1.9.2', license: 'MIT',
default_options : ['cpp_std=c++11'])
project('spdlog', 'cpp', version : '1.10.0', license: 'MIT',
default_options : ['cpp_std=c++20'])
inc = include_directories('include')
thread_dep = dependency('threads')
spdlog_dependencies = [thread_dep]
spdlog_dependencies = [thread_dep]
spdlog_compile_args = []
@ -18,9 +18,9 @@ endif
if get_option('compile_library')
spdlog_compile_args += '-DSPDLOG_COMPILED_LIB'
subdir('src')
spdlog_dep = declare_dependency(include_directories : inc, dependencies : spdlog_dependencies, link_with : spdlog_lib, compile_args : spdlog_compile_args)
else
else
spdlog_dep = declare_dependency(include_directories : inc, dependencies : spdlog_dependencies, compile_args : spdlog_compile_args)
endif

View File

@ -0,0 +1,8 @@
[wrap-git]
url = https://github.com/ericniebler/range-v3.git
revision = 0fa54d7de5dc00655e38a08e87cda61f7aa6d5b9
patch_directory = range-v3
[provide]
range-v3 = range_dep