3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 02:38:05 +08:00
Code Issues Projects Releases Wiki Activity

[vcpkg] Refactor VcpkgCmdArguments to not utilize global state

Browse Source
This commit is contained in:
Robert Schumacher 2018-02-26 18:22:17 -08:00
parent e2980c8f91
commit a2e6ffd86d
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolsrc/include/vcpkg/vcpkgcmdarguments.h
View File

@ -79,6 +79,8 @@ namespace vcpkg
Optional<bool> sendmetrics = nullopt;
Optional<bool> printmetrics = nullopt;
// feature flags
Optional<bool> featurepackages = nullopt;
std::string command;
std::vector<std::string> command_arguments;

1
toolsrc/src/vcpkg.cpp
View File

@ -265,6 +265,7 @@ int main(const int argc, const char* const* const argv)
const VcpkgCmdArguments args = VcpkgCmdArguments::create_from_command_line(argc, argv);
if (const auto p = args.featurepackages.get()) GlobalState::feature_packages = *p;
if (const auto p = args.printmetrics.get()) Metrics::g_metrics.lock()->set_print_metrics(*p);
if (const auto p = args.sendmetrics.get()) Metrics::g_metrics.lock()->set_send_metrics(*p);
if (const auto p = args.debug.get()) GlobalState::debugging = *p;

5
toolsrc/src/vcpkg/vcpkgcmdarguments.cpp
View File

@ -126,12 +126,13 @@ namespace vcpkg
}
if (arg == "--featurepackages")
{
GlobalState::feature_packages = true;
parse_switch(true, "featurepackages", args.featurepackages);
continue;
}
if (arg == "--no-featurepackages")
{
GlobalState::feature_packages = false;
parse_switch(false, "featurepackages", args.featurepackages);
continue;
continue;
}