diff --git a/ci_config.json b/ci_config.json index 017195e62e..87896a143a 100644 --- a/ci_config.json +++ b/ci_config.json @@ -1713,7 +1713,8 @@ }, "yaml-cpp": { "build_options": [ - "yaml-cpp:tests=enabled" + "yaml-cpp:tests=enabled", + "gtest:default_library=static" ] }, "zycore": { diff --git a/releases.json b/releases.json index a06624cfdb..b4abedde6e 100644 --- a/releases.json +++ b/releases.json @@ -5075,6 +5075,7 @@ "yaml-cpp" ], "versions": [ + "0.9.0-1", "0.8.0-2", "0.8.0-1" ] diff --git a/subprojects/packagefiles/yaml-cpp/meson.build b/subprojects/packagefiles/yaml-cpp/meson.build index cd2f7eb17d..def7ece6a9 100644 --- a/subprojects/packagefiles/yaml-cpp/meson.build +++ b/subprojects/packagefiles/yaml-cpp/meson.build @@ -1,8 +1,8 @@ project( 'yaml-cpp', 'cpp', - version: '0.8.0', - meson_version: '>=0.54.0', + version: '0.9.0', + meson_version: '>=0.56.0', license: 'MIT', ) diff --git a/subprojects/packagefiles/yaml-cpp/src/meson.build b/subprojects/packagefiles/yaml-cpp/src/meson.build index 4f1acfb38b..a0a4a0d1af 100644 --- a/subprojects/packagefiles/yaml-cpp/src/meson.build +++ b/subprojects/packagefiles/yaml-cpp/src/meson.build @@ -10,6 +10,7 @@ src = files( 'emitterutils.cpp', 'exceptions.cpp', 'exp.cpp', + 'fptostring.cpp', 'memory.cpp', 'node.cpp', 'node_data.cpp', diff --git a/subprojects/packagefiles/yaml-cpp/test/meson.build b/subprojects/packagefiles/yaml-cpp/test/meson.build index 3f2781e981..3da6c2e12d 100644 --- a/subprojects/packagefiles/yaml-cpp/test/meson.build +++ b/subprojects/packagefiles/yaml-cpp/test/meson.build @@ -2,13 +2,16 @@ gmock_dep = dependency( 'gmock', required: get_option('tests'), ) +gtest_dep = dependency( + 'gtest', + required: get_option('tests'), +) -if not gmock_dep.found() +if not gmock_dep.found() or not gtest_dep.found() subdir_done() endif tests_src = files( - 'binary_test.cpp', 'integration/emitter_test.cpp', 'integration/encoding_test.cpp', 'integration/error_messages_test.cpp', @@ -17,8 +20,10 @@ tests_src = files( 'integration/handler_test.cpp', 'integration/load_node_test.cpp', 'integration/node_spec_test.cpp', - 'main.cpp', 'node/node_test.cpp', + 'binary_test.cpp', + 'fptostring_test.cpp', + 'main.cpp', 'ostream_wrapper_test.cpp', 'parser_test.cpp', 'regex_test.cpp', @@ -33,7 +38,7 @@ yaml_cpp_tests_exe = executable( 'yaml-cpp-tests', tests_src, include_directories: private_inc, - dependencies: [yaml_cpp_dep, gmock_dep], + dependencies: [yaml_cpp_dep, gmock_dep, gtest_dep], cpp_args: test_args, override_options: ['cpp_std=c++17'], build_by_default: false, diff --git a/subprojects/yaml-cpp.wrap b/subprojects/yaml-cpp.wrap index 6b54dc6487..c2d68ef38e 100644 --- a/subprojects/yaml-cpp.wrap +++ b/subprojects/yaml-cpp.wrap @@ -1,8 +1,8 @@ [wrap-file] -directory = yaml-cpp-0.8.0 -source_url = https://github.com/jbeder/yaml-cpp/archive/refs/tags/0.8.0.zip -source_filename = yaml-cpp-0.8.0.zip -source_hash = 334e80ab7b52e14c23f94e041c74bab0742f2281aad55f66be2f19f4b7747071 +directory = yaml-cpp-yaml-cpp-0.9.0 +source_url = https://github.com/jbeder/yaml-cpp/archive/refs/tags/yaml-cpp-0.9.0.tar.gz +source_filename = yaml-cpp-0.9.0.tar.gz +source_hash = 25cb043240f828a8c51beb830569634bc7ac603978e0f69d6b63558dadefd49a patch_directory = yaml-cpp [provide]