Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ci_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -1713,7 +1713,8 @@
},
"yaml-cpp": {
"build_options": [
"yaml-cpp:tests=enabled"
"yaml-cpp:tests=enabled",
"gtest:default_library=static"
]
},
"zycore": {
Expand Down
1 change: 1 addition & 0 deletions releases.json
Original file line number Diff line number Diff line change
Expand Up @@ -5075,6 +5075,7 @@
"yaml-cpp"
],
"versions": [
"0.9.0-1",
"0.8.0-2",
"0.8.0-1"
]
Expand Down
4 changes: 2 additions & 2 deletions subprojects/packagefiles/yaml-cpp/meson.build
Original file line number Diff line number Diff line change
@@ -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',

Check notice on line 5 in subprojects/packagefiles/yaml-cpp/meson.build

View workflow job for this annotation

GitHub Actions / Ubuntu (x86_64)

Minimum Meson version is 0.56.0

0.56.0: oldest version supported by WrapDB
license: 'MIT',
)

Expand Down
1 change: 1 addition & 0 deletions subprojects/packagefiles/yaml-cpp/src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ src = files(
'emitterutils.cpp',
'exceptions.cpp',
'exp.cpp',
'fptostring.cpp',
'memory.cpp',
'node.cpp',
'node_data.cpp',
Expand Down
13 changes: 9 additions & 4 deletions subprojects/packagefiles/yaml-cpp/test/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions subprojects/yaml-cpp.wrap
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
Loading