diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-08-26 00:38:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-26 00:38:27 -0700 |
| commit | 3a026cbe21881dc35278c2c7946b3b12b7815d09 (patch) | |
| tree | c3fcff1979504fbc2e17f8c143371c2d2e02f1f5 /toolsrc/include | |
| parent | 7a2a237e13da457bc672e27c03c492e128bdd11d (diff) | |
| parent | 70949b0d814c469d76b8ddecc514ae0af6686347 (diff) | |
| download | vcpkg-3a026cbe21881dc35278c2c7946b3b12b7815d09.tar.gz vcpkg-3a026cbe21881dc35278c2c7946b3b12b7815d09.zip | |
Merge pull request #1690 from Mixaill/vcpkg-toolsetsdetection-fix
[vcpkg] testing for architectures supported by toolset
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/VcpkgPaths.h | 8 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg_System.h | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/toolsrc/include/VcpkgPaths.h b/toolsrc/include/VcpkgPaths.h index e4e7ba83d..d55c95fe1 100644 --- a/toolsrc/include/VcpkgPaths.h +++ b/toolsrc/include/VcpkgPaths.h @@ -8,11 +8,19 @@ namespace vcpkg { + struct ToolsetArchOption + { + CWStringView name; + System::CPUArchitecture host_arch; + System::CPUArchitecture target_arch; + }; + struct Toolset { fs::path dumpbin; fs::path vcvarsall; CWStringView version; + std::vector<ToolsetArchOption> supported_architectures; }; struct VcpkgPaths diff --git a/toolsrc/include/vcpkg_System.h b/toolsrc/include/vcpkg_System.h index 2ea0241f6..32da6e39c 100644 --- a/toolsrc/include/vcpkg_System.h +++ b/toolsrc/include/vcpkg_System.h @@ -77,6 +77,8 @@ namespace vcpkg::System CPUArchitecture get_host_processor(); + std::vector<CPUArchitecture> get_supported_host_architectures(); + const fs::path& get_ProgramFiles_32_bit(); const fs::path& get_ProgramFiles_platform_bitness(); |