diff --git a/CMakeLists.txt b/CMakeLists.txt index d27ed7d..dba90fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,45 +38,45 @@ CPMAddPackage( CPMAddPackage( NAME fmt GITHUB_REPOSITORY fmtlib/fmt - GIT_TAG 10.0.0 + GIT_TAG 10.1.1 EXCLUDE_FROM_ALL YES ) CPMAddPackage( NAME tomlplusplus GITHUB_REPOSITORY marzer/tomlplusplus - GIT_TAG ad55bae8a11a6eee39e2292b01e95b529b105767 + GIT_TAG d8fa9a1fddc90254cac2366dde23f0b613bc1280 EXCLUDE_FROM_ALL YES ) CPMAddPackage( NAME spdlog GITHUB_REPOSITORY gabime/spdlog - GIT_TAG 31cf79a70dfa61a4b2b7509eecca6a3b269bfc4a + GIT_TAG ac55e60488032b9acde8940a5de099541c4515da EXCLUDE_FROM_ALL YES ) CPMAddPackage( NAME rapidjson GITHUB_REPOSITORY Tencent/rapidjson - GIT_TAG 973dc9c06dcd3d035ebd039cfb9ea457721ec213 + GIT_TAG f9d53419e912910fd8fa57d5705fa41425428c35 EXCLUDE_FROM_ALL YES ) if(NOT ENABLE_DEVENV) CPMAddPackage( NAME cpr GITHUB_REPOSITORY libcpr/cpr - GIT_TAG 1.10.4 + GIT_TAG 67e2a4d2a76ed520e352f10e651a6f98e220dbd7 EXCLUDE_FROM_ALL YES ) endif() CPMAddPackage( NAME range-v3 GITHUB_REPOSITORY ericniebler/range-v3 - GIT_TAG 4624c63972c6f2c2871c7b87813c42048ddb80ad + GIT_TAG 97452bb3eb74a73fc86504421a6a27c92bce6b99 EXCLUDE_FROM_ALL YES ) CPMAddPackage( NAME ctre GITHUB_REPOSITORY hanickadot/compile-time-regular-expressions - GIT_TAG v3.7.2 + GIT_TAG v3.8.1 EXCLUDE_FROM_ALL YES ) diff --git a/meson.build b/meson.build index c446653..b42a7a5 100644 --- a/meson.build +++ b/meson.build @@ -50,17 +50,17 @@ endif add_global_arguments('-DINSTALLER_VERSION="' + git_version + '"', language : 'cpp') # Common dependencies -spdlog = dependency('spdlog', version : ['>=1.9.2'], fallback : ['spdlog', 'spdlog_dep']) -fmt = dependency('fmt', version : ['>=10.0.0'], fallback : ['fmt', 'fmt_dep']) +spdlog = dependency('spdlog', version : ['>=1.12.0'], fallback : ['spdlog', 'spdlog_dep']) +fmt = dependency('fmt', version : ['>=10.1.0'], fallback : ['fmt', 'fmt_dep']) ftxui = dependency('ftxui', modules : ['ftxui::screen', 'ftxui::dom', 'ftxui::component'], fallback : ['ftxui', 'ftxui_dep']) rapidjson = dependency('rapidjson', version : ['>=1.1.0'], fallback : ['rapidjson', 'rapidjson_dep']) ranges = dependency('range-v3', version : ['>=0.11.0'], fallback : ['range-v3', 'range_dep']) -ctre = dependency('ctre', version : ['>=3.7.0'], fallback : ['ctre', 'ctre_dep']) -tomlplusplus = dependency('tomlplusplus', version : ['>=3.3.0'], fallback : ['tomlplusplus', 'tomlplusplus_dep'], default_options: ['compile_library=false']) +ctre = dependency('ctre', version : ['>=3.8.0'], fallback : ['ctre', 'ctre_dep']) +tomlplusplus = dependency('tomlplusplus', version : ['>=3.4.0'], fallback : ['tomlplusplus', 'tomlplusplus_dep'], default_options: ['compile_library=false']) #glibmm = dependency('glibmm-2.4', version : ['>=2.56.0']) if not is_dev_environment - cpr = dependency('cpr', version : ['>=1.7.0'], fallback : ['cpr', 'cpr_dep']) + cpr = dependency('cpr', version : ['>=1.10.0'], fallback : ['cpr', 'cpr_dep']) endif src_files = files( diff --git a/subprojects/cpr.wrap b/subprojects/cpr.wrap index b6e79b0..d96e9f8 100644 --- a/subprojects/cpr.wrap +++ b/subprojects/cpr.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/libcpr/cpr.git -revision = 1.10.4 +revision = 1.10.5 patch_directory = cpr diff --git a/subprojects/ctre.wrap b/subprojects/ctre.wrap index 44bccc9..80d4ad5 100644 --- a/subprojects/ctre.wrap +++ b/subprojects/ctre.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/hanickadot/compile-time-regular-expressions.git -revision = v3.7.2 +revision = v3.8.1 patch_directory = ctre diff --git a/subprojects/fmt.wrap b/subprojects/fmt.wrap index db27656..bcb59a3 100644 --- a/subprojects/fmt.wrap +++ b/subprojects/fmt.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/fmtlib/fmt.git -revision = 10.0.0 +revision = 10.1.1 patch_directory = fmt diff --git a/subprojects/packagefiles/ctre/meson.build b/subprojects/packagefiles/ctre/meson.build index 0eac192..ae940ea 100644 --- a/subprojects/packagefiles/ctre/meson.build +++ b/subprojects/packagefiles/ctre/meson.build @@ -1,4 +1,4 @@ -project('ctre', 'cpp', version: '3.7.2', +project('ctre', 'cpp', version: '3.8.1', license: 'Apache-2.0') ctre_inc = include_directories('include') diff --git a/subprojects/packagefiles/fmt/meson.build b/subprojects/packagefiles/fmt/meson.build index 70a9d8b..2dc249a 100644 --- a/subprojects/packagefiles/fmt/meson.build +++ b/subprojects/packagefiles/fmt/meson.build @@ -1,5 +1,5 @@ project('fmt', 'cpp', - version : '10.0.0', + version : '10.1.1', license : 'BSD', default_options : [ 'cpp_std=c++20', diff --git a/subprojects/packagefiles/spdlog/meson.build b/subprojects/packagefiles/spdlog/meson.build index 5923ef6..3ad754d 100644 --- a/subprojects/packagefiles/spdlog/meson.build +++ b/subprojects/packagefiles/spdlog/meson.build @@ -1,4 +1,4 @@ -project('spdlog', 'cpp', version : '1.11.0', license: 'MIT', +project('spdlog', 'cpp', version : '1.12.0', license: 'MIT', default_options : ['cpp_std=c++20']) inc = include_directories('include') diff --git a/subprojects/packagefiles/spdlog/src/meson.build b/subprojects/packagefiles/spdlog/src/meson.build index 3c10cd1..c9bce45 100644 --- a/subprojects/packagefiles/spdlog/src/meson.build +++ b/subprojects/packagefiles/spdlog/src/meson.build @@ -7,7 +7,7 @@ src = [ 'cfg.cpp' ] -fmt = 'fmt.cpp' +fmt = 'bundled_fmtlib_format.cpp' if not(get_option('external_fmt')) diff --git a/subprojects/range-v3.wrap b/subprojects/range-v3.wrap index f5534c2..250a7f8 100644 --- a/subprojects/range-v3.wrap +++ b/subprojects/range-v3.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/ericniebler/range-v3.git -revision = 4624c63972c6f2c2871c7b87813c42048ddb80ad +revision = 97452bb3eb74a73fc86504421a6a27c92bce6b99 patch_directory = range-v3 diff --git a/subprojects/spdlog.wrap b/subprojects/spdlog.wrap index fc15c88..820b5b7 100644 --- a/subprojects/spdlog.wrap +++ b/subprojects/spdlog.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/gabime/spdlog.git -revision = 31cf79a70dfa61a4b2b7509eecca6a3b269bfc4a +revision = ac55e60488032b9acde8940a5de099541c4515da patch_directory = spdlog diff --git a/subprojects/tomlplusplus.wrap b/subprojects/tomlplusplus.wrap index d3e015b..c9a12a5 100644 --- a/subprojects/tomlplusplus.wrap +++ b/subprojects/tomlplusplus.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/marzer/tomlplusplus.git -revision = ad55bae8a11a6eee39e2292b01e95b529b105767 +revision = d8fa9a1fddc90254cac2366dde23f0b613bc1280 [provide] tomlplusplus = tomlplusplus_dep