diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2020-08-14 09:53:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-14 09:53:04 -0700 |
| commit | 0c2117845e1f2e3c260b74af8d60f315343b094e (patch) | |
| tree | 9a0e321a6a30a897803228f1d69d1936b7b3b039 /toolsrc/include/vcpkg-test | |
| parent | 2cdf1cad7aa9944a4c8edb90cb3656560c7b56d1 (diff) | |
| download | vcpkg-0c2117845e1f2e3c260b74af8d60f315343b094e.tar.gz vcpkg-0c2117845e1f2e3c260b74af8d60f315343b094e.zip | |
[vcpkg] Reduce dependencies and contents of vcpkgpaths.h (#12876)
* [vcpkg] Remove globally-constructed pre-defined Triplets from vcpkg.exe
The tool should be as triplet-agnostic as possible, which leaves little room for special, pre-defined names like this. However, tests do have use of them: moved into test assets.
* [vcpkg] Move predefined tools strings vcpkgpaths.h -> tools.h
* [vcpkg] Add forward declarations to vcpkgpaths.h to reduce header deps
* Merge from origin/master
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'toolsrc/include/vcpkg-test')
| -rw-r--r-- | toolsrc/include/vcpkg-test/util.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/toolsrc/include/vcpkg-test/util.h b/toolsrc/include/vcpkg-test/util.h index 5170c846a..d2c512f9b 100644 --- a/toolsrc/include/vcpkg-test/util.h +++ b/toolsrc/include/vcpkg-test/util.h @@ -64,6 +64,12 @@ namespace vcpkg::Test const char* depends = "", const char* triplet = "x86-windows"); + extern const Triplet X86_WINDOWS; + extern const Triplet X64_WINDOWS; + extern const Triplet X86_UWP; + extern const Triplet ARM_UWP; + extern const Triplet X64_ANDROID; + /// <summary> /// Map of source control files by their package name. /// </summary> @@ -71,7 +77,7 @@ namespace vcpkg::Test { std::unordered_map<std::string, SourceControlFileLocation> map; Triplet triplet; - PackageSpecMap(Triplet t = Triplet::X86_WINDOWS) noexcept : triplet(t) { } + PackageSpecMap(Triplet t = X86_WINDOWS) noexcept : triplet(t) { } PackageSpec emplace(const char* name, const char* depends = "", |