aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/commands_install.cpp
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-08-20 19:09:39 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-08-20 19:09:39 -0700
commitbd222504abea410d77487e176649ae9b6989c4e0 (patch)
tree11eaca74aa69437ca4ac652bf2799d1d39b6d67e /toolsrc/src/commands_install.cpp
parentf219ce0b8c3e84e5fc1df21ad2f2c8b13f0fe413 (diff)
downloadvcpkg-bd222504abea410d77487e176649ae9b6989c4e0.tar.gz
vcpkg-bd222504abea410d77487e176649ae9b6989c4e0.zip
[vcpkg] Refactor parsing together and flatten featurespec usages
Diffstat (limited to 'toolsrc/src/commands_install.cpp')
-rw-r--r--toolsrc/src/commands_install.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp
index 2965d9025..3fc0e2563 100644
--- a/toolsrc/src/commands_install.cpp
+++ b/toolsrc/src/commands_install.cpp
@@ -14,10 +14,10 @@
namespace vcpkg::Commands::Install
{
using Dependencies::InstallPlanAction;
- using Dependencies::RequestType;
using Dependencies::InstallPlanType;
using Dependencies::RemovePlanAction;
using Dependencies::RemovePlanType;
+ using Dependencies::RequestType;
InstallDir InstallDir::from_destination_root(const fs::path& destination_root,
const std::string& destination_subdirectory,
@@ -440,8 +440,8 @@ namespace vcpkg::Commands::Install
.value_or_exit(VCPKG_LINE_INFO);
scf_map[pkg_spec] = std::move(*port);
}
- std::vector<Dependencies::AnyAction> action_plan =
- Dependencies::create_feature_install_plan(scf_map, full_specs, status_db);
+ std::vector<Dependencies::AnyAction> action_plan = Dependencies::create_feature_install_plan(
+ scf_map, FullPackageSpec::to_feature_specs(full_specs), status_db);
// install plan will be empty if it is already installed - need to change this at status paragraph part
Checks::check_exit(
VCPKG_LINE_INFO, !action_plan.empty(), "Install plan cannot be empty for feature packages");