diff options
| author | Squareys <squareys@googlemail.com> | 2018-02-16 14:27:32 +0100 |
|---|---|---|
| committer | Squareys <squareys@googlemail.com> | 2018-02-16 14:27:59 +0100 |
| commit | f1ce125a28c98fd5a87bf509ac965b06c219d8f3 (patch) | |
| tree | dbe22888b9a5a617dff4f5c9c0e83a5002f96187 /toolsrc/src | |
| parent | 16faed678540be37ea623fa7f0f2c2e7c442b147 (diff) | |
| download | vcpkg-f1ce125a28c98fd5a87bf509ac965b06c219d8f3.tar.gz vcpkg-f1ce125a28c98fd5a87bf509ac965b06c219d8f3.zip | |
[vcpkg] Fix build command for packages that depend of features
Signed-off-by: Squareys <squareys@googlemail.com>
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg/build.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 7de276f4f..cc376c773 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -267,13 +267,16 @@ namespace vcpkg::Build const Triplet& triplet = config.triplet; { - std::vector<PackageSpec> missing_specs; + std::vector<FeatureSpec> missing_specs; for (auto&& dep : filter_dependencies(config.scf.core_paragraph->depends, triplet)) { - auto dep_spec = PackageSpec::from_name_and_triplet(dep, triplet).value_or_exit(VCPKG_LINE_INFO); - if (!status_db.is_installed(dep_spec)) + auto dep_specs = FeatureSpec::from_strings_and_triplet({dep}, triplet); + for (auto&& feature : dep_specs) { - missing_specs.push_back(std::move(dep_spec)); + if (!status_db.is_installed(feature)) + { + missing_specs.push_back(std::move(feature)); + } } } // Fail the build if any dependencies were missing @@ -600,7 +603,7 @@ namespace vcpkg::Build : code(code), binary_control_file(std::move(bcf)) { } - ExtendedBuildResult::ExtendedBuildResult(BuildResult code, std::vector<PackageSpec>&& unmet_deps) + ExtendedBuildResult::ExtendedBuildResult(BuildResult code, std::vector<FeatureSpec>&& unmet_deps) : code(code), unmet_dependencies(std::move(unmet_deps)) { } |
