From a2e6ffd86d435f08116e5e80b04796fe6898ebd0 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 26 Feb 2018 18:22:17 -0800 Subject: [vcpkg] Refactor VcpkgCmdArguments to not utilize global state --- toolsrc/src/vcpkg.cpp | 1 + toolsrc/src/vcpkg/vcpkgcmdarguments.cpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'toolsrc/src') diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index adb32c723..ffda7ede9 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -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; diff --git a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp index 84ad17fe3..18acf8e12 100644 --- a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp +++ b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp @@ -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; } -- cgit v1.2.3