diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fe07a3a..f3d5e37c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ Versioning](https://semver.org/spec/v2.0.0.html). - This release includes a workaround to make bitsery compile with GCC 13 due to changes in transitive header includes. +- The tomlplusplus dependency has been updated to target version 3.4.0. ## [5.0.5] - 2023-05-07 diff --git a/meson.build b/meson.build index e720fe7c..b1932afc 100644 --- a/meson.build +++ b/meson.build @@ -270,8 +270,10 @@ dbus_dep = dependency('dbus-1').partial_dependency(compile_args : true, includes function2_dep = dependency('function2', version : '>=4.0.0') ghc_filesystem_dep = dependency('ghc_filesystem', modules : 'ghcFilesystem::ghc_filesystem', version : '>=1.5.0') threads_dep = dependency('threads') -# Tomlplusplus recently added a shraed library version. We don't want to link to that. -tomlplusplus_dep = dependency('tomlplusplus', version : '>=3.3.0', default_options : ['compile_library=false']).partial_dependency(compile_args : true, includes : true) +# Tomlplusplus recently added a shraed library version. We don't want to link to +# that. `compile_library` is deprecated but it (incorrectly) defaults to `true` +# so we can't omit it. +tomlplusplus_dep = dependency('tomlplusplus', version : '>=3.4.0', default_options : ['compile_library=false']).partial_dependency(compile_args : true, includes : true) dl_dep = declare_dependency(link_args : '-ldl') rt_dep = declare_dependency(link_args : '-lrt') diff --git a/subprojects/tomlplusplus.wrap b/subprojects/tomlplusplus.wrap index a187b5f0..6f99fd6f 100644 --- a/subprojects/tomlplusplus.wrap +++ b/subprojects/tomlplusplus.wrap @@ -1,7 +1,7 @@ [wrap-git] url = https://github.com/marzer/tomlplusplus.git -# Tag v3.3.0 -revision = c635f218c0aefc801d9748841930365e54fe3089 +# Tag v3.4.0 +revision = 30172438cee64926dc41fdd9c11fb3ba5b2ba9de depth = 1 [provide]