diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-10 17:00:46 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-15 18:06:06 -0800 |
| commit | 2b9035063234f04fb68c3b4fefe8d3da7a5175a6 (patch) | |
| tree | 13140f379847760858f124096c429a5a32600ef8 /toolsrc/src/commands_install.cpp | |
| parent | 1ecf03e2b08c0ec3be62da4989730108c7c8de23 (diff) | |
| download | vcpkg-2b9035063234f04fb68c3b4fefe8d3da7a5175a6.tar.gz vcpkg-2b9035063234f04fb68c3b4fefe8d3da7a5175a6.zip | |
Separate dependency check from build_package()
Diffstat (limited to 'toolsrc/src/commands_install.cpp')
| -rw-r--r-- | toolsrc/src/commands_install.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index 48da05e9c..a57d2cc6d 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -214,7 +214,9 @@ namespace vcpkg::Commands::Install } else if (action.plan.plan_type == install_plan_type::BUILD_AND_INSTALL) { - const Build::BuildResult result = Commands::Build::build_package(*action.plan.source_pgh, action.spec, paths, paths.port_dir(action.spec)); + const Build::DependencyStatus dependency_status = Build::check_dependencies(*action.plan.source_pgh, action.spec, status_db); + Checks::check_exit(dependency_status == Build::DependencyStatus::ALL_DEPENDENCIES_INSTALLED); + const Build::BuildResult result = Commands::Build::build_package(*action.plan.source_pgh, action.spec, paths, paths.port_dir(action.spec), dependency_status); if (result != Build::BuildResult::SUCCESS) { exit(EXIT_FAILURE); |