diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-09-23 12:20:09 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-09-23 12:20:09 -0700 |
| commit | 8a8180503d8217959d96a9f2b9fc6366d67c1354 (patch) | |
| tree | 71f299f461d4c726a5cf49a535b42898149caccc /toolsrc/src/commands_installation.cpp | |
| parent | b2f6a769ea015f49c7061e36c8c7125dd53ca01e (diff) | |
| parent | ddd0f88579eb1adff0dd8b14458c4bf70eaa902d (diff) | |
| download | vcpkg-8a8180503d8217959d96a9f2b9fc6366d67c1354.tar.gz vcpkg-8a8180503d8217959d96a9f2b9fc6366d67c1354.zip | |
Merge branch 'alzie-default_triplet'
Diffstat (limited to 'toolsrc/src/commands_installation.cpp')
| -rw-r--r-- | toolsrc/src/commands_installation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/src/commands_installation.cpp b/toolsrc/src/commands_installation.cpp index 0902ba525..35e1ba28c 100644 --- a/toolsrc/src/commands_installation.cpp +++ b/toolsrc/src/commands_installation.cpp @@ -60,7 +60,7 @@ namespace vcpkg { StatusParagraphs status_db = database_load_check(paths); - std::vector<package_spec> specs = args.parse_all_arguments_as_package_specs(default_target_triplet); + std::vector<package_spec> specs = args.parse_all_arguments_as_package_specs(paths, default_target_triplet); 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]); @@ -119,7 +119,7 @@ namespace vcpkg StatusParagraphs status_db = database_load_check(paths); - const package_spec spec = args.parse_all_arguments_as_package_specs(default_target_triplet).at(0); + const package_spec spec = args.parse_all_arguments_as_package_specs(paths, default_target_triplet).at(0); std::unordered_set<package_spec> unmet_dependencies = Dependencies::find_unmet_dependencies(paths, spec, status_db); if (!unmet_dependencies.empty()) { |