The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[vcpkg] Fill in feature lists during CI reporting

Browse Source
This commit is contained in:
Robert Schumacher 2020-03-18 12:18:24 -07:00
parent 44b9703a81
commit 4bf1cf35ba
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
toolsrc/src/vcpkg/commands.ci.cpp
View File

@ -293,9 +293,7 @@ namespace vcpkg::Commands::CI
std::vector<FullPackageSpec> install_specs; std::vector<FullPackageSpec> install_specs;
for (auto&& install_action : action_plan.install_actions) for (auto&& install_action : action_plan.install_actions)
{ {
install_specs.emplace_back(FullPackageSpec{ install_specs.emplace_back(FullPackageSpec{install_action.spec, install_action.feature_list});
install_action.spec,
std::vector<std::string>{install_action.feature_list.begin(), install_action.feature_list.end()}});
} }
var_provider.load_tag_vars(install_specs, provider); var_provider.load_tag_vars(install_specs, provider);
@ -315,6 +313,7 @@ namespace vcpkg::Commands::CI
{ {
auto p = &action; auto p = &action;
ret->abi_map.emplace(action.spec, action.package_abi.value_or_exit(VCPKG_LINE_INFO)); ret->abi_map.emplace(action.spec, action.package_abi.value_or_exit(VCPKG_LINE_INFO));
ret->features.emplace(action.spec, action.feature_list);
if (auto scfl = p->source_control_file_location.get()) if (auto scfl = p->source_control_file_location.get())
{ {
auto emp = ret->default_feature_provider.emplace(p->spec.name(), *scfl); auto emp = ret->default_feature_provider.emplace(p->spec.name(), *scfl);