diff options
| author | Daniel Shaw <danielshaw1212@gmail.com> | 2017-07-24 16:11:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-24 16:11:22 -0700 |
| commit | b277b4dda3a2793fd59a6cca5de96f8bc65f1357 (patch) | |
| tree | 67299d7ae4d032948d4d65a2f494b61fac025b0a /toolsrc/include/PackageSpec.h | |
| parent | 3c841c6128ebfe8e99a372f2907bd985b533a799 (diff) | |
| parent | 59389ca236b005922cf1101f66c957d2396f6371 (diff) | |
| download | vcpkg-b277b4dda3a2793fd59a6cca5de96f8bc65f1357.tar.gz vcpkg-b277b4dda3a2793fd59a6cca5de96f8bc65f1357.zip | |
Merge pull request #1461 from Microsoft/create_install_tests
feature packages graph algorithm
Diffstat (limited to 'toolsrc/include/PackageSpec.h')
| -rw-r--r-- | toolsrc/include/PackageSpec.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h index 62b6fc9de..15b5e5b9b 100644 --- a/toolsrc/include/PackageSpec.h +++ b/toolsrc/include/PackageSpec.h @@ -1,5 +1,6 @@ #pragma once #include "PackageSpecParseResult.h" +#include "SourceParagraph.h" #include "Triplet.h" #include "vcpkg_expected.h" @@ -7,8 +8,6 @@ namespace vcpkg { struct PackageSpec { - static ExpectedT<PackageSpec, PackageSpecParseResult> from_string(const std::string& spec_as_string, - const Triplet& default_triplet); static std::string to_string(const std::string& name, const Triplet& triplet); static ExpectedT<PackageSpec, PackageSpecParseResult> from_name_and_triplet(const std::string& name, const Triplet& triplet); @@ -30,6 +29,9 @@ namespace vcpkg { PackageSpec package_spec; std::vector<std::string> features; + + static ExpectedT<FullPackageSpec, PackageSpecParseResult> from_string(const std::string& spec_as_string, + const Triplet& default_triplet); }; bool operator==(const PackageSpec& left, const PackageSpec& right); |
