diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-09-30 16:49:30 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-09-30 16:49:30 -0700 |
| commit | 8becbe15a2a7f229041b70d0333ffc96522efb6f (patch) | |
| tree | 779080b755ea779421e546e10c1f8de388140c7a /toolsrc/src/commands_installation.cpp | |
| parent | bcb2be360a3ce577fc09fe1ffb6b7e0335ebb889 (diff) | |
| download | vcpkg-8becbe15a2a7f229041b70d0333ffc96522efb6f.tar.gz vcpkg-8becbe15a2a7f229041b70d0333ffc96522efb6f.zip | |
Place check_and_get_package_spec in a separate file
Diffstat (limited to 'toolsrc/src/commands_installation.cpp')
| -rw-r--r-- | toolsrc/src/commands_installation.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/toolsrc/src/commands_installation.cpp b/toolsrc/src/commands_installation.cpp index 9eacfedcc..9eedebdbe 100644 --- a/toolsrc/src/commands_installation.cpp +++ b/toolsrc/src/commands_installation.cpp @@ -7,6 +7,7 @@ #include "post_build_lint.h" #include "vcpkg_System.h" #include "vcpkg_Dependencies.h" +#include "vcpkg_Input.h" namespace vcpkg { @@ -69,7 +70,7 @@ namespace vcpkg args.check_min_arg_count(1, example.c_str()); StatusParagraphs status_db = database_load_check(paths); - std::vector<package_spec> specs = vcpkg_cmd_arguments::check_and_get_package_specs(args.command_arguments, default_target_triplet, example.c_str()); + std::vector<package_spec> specs = Input::check_and_get_package_specs(args.command_arguments, default_target_triplet, example.c_str()); std::vector<package_spec> install_plan = Dependencies::create_dependency_ordered_install_plan(paths, specs, status_db); Checks::check_exit(!install_plan.empty(), "Install plan cannot be empty"); std::string specs_string = to_string(install_plan[0]); @@ -130,7 +131,7 @@ namespace vcpkg args.check_exact_arg_count(1, example.c_str()); StatusParagraphs status_db = database_load_check(paths); - const package_spec spec = vcpkg_cmd_arguments::check_and_get_package_spec(args.command_arguments.at(0), default_target_triplet, example.c_str()); + const package_spec spec = Input::check_and_get_package_spec(args.command_arguments.at(0), default_target_triplet, example.c_str()); std::unordered_set<package_spec> unmet_dependencies = Dependencies::find_unmet_dependencies(paths, spec, status_db); if (!unmet_dependencies.empty()) { |