diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2020-08-12 12:35:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-12 12:35:26 -0700 |
| commit | c771e7bd07c3137d43cdca96efcb954439133532 (patch) | |
| tree | 191b7d6e9a28072c1ffa592c8008664ff462c6c2 /toolsrc/include/vcpkg-test | |
| parent | f3b96f339c3179f8f1c46b412d192e0c8a84eb5e (diff) | |
| download | vcpkg-c771e7bd07c3137d43cdca96efcb954439133532.tar.gz vcpkg-c771e7bd07c3137d43cdca96efcb954439133532.zip | |
[vcpkg] Fix resolution of default features when using Manifest mode (#12829)
* [vcpkg] Fix resolution of default features when using Manifest mode
During manifest mode, the dependencies in the manifest should be treated as explicitly specified -- curl[core] should not install curl's default features.
* [vcpkg] Improve error message when failed to parse manifest file
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'toolsrc/include/vcpkg-test')
| -rw-r--r-- | toolsrc/include/vcpkg-test/util.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/toolsrc/include/vcpkg-test/util.h b/toolsrc/include/vcpkg-test/util.h index ce403c308..5170c846a 100644 --- a/toolsrc/include/vcpkg-test/util.h +++ b/toolsrc/include/vcpkg-test/util.h @@ -18,6 +18,22 @@ } \ } while (0) +namespace Catch +{ + template<> + struct StringMaker<vcpkg::FullPackageSpec> + { + static std::string convert(vcpkg::FullPackageSpec const& value) + { + return vcpkg::Strings::concat(value.package_spec.name(), + '[', + vcpkg::Strings::join(",", value.features), + "]:", + value.package_spec.triplet()); + } + }; +} + namespace vcpkg::Test { std::unique_ptr<SourceControlFile> make_control_file( |