diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-09-27 18:55:09 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-09-27 18:55:09 -0700 |
| commit | 0ccea4f3677d92a20935e03c2cb301d8300b43d1 (patch) | |
| tree | 85091281b06a275fd9802799ebd43c1bce24102d /toolsrc/include | |
| parent | f617a711ec4c3d5527911c32340238053901269d (diff) | |
| download | vcpkg-0ccea4f3677d92a20935e03c2cb301d8300b43d1.tar.gz vcpkg-0ccea4f3677d92a20935e03c2cb301d8300b43d1.zip | |
[Toolset selection] Use VS2017 vcvarsall for v140 if available
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/VcpkgPaths.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/toolsrc/include/VcpkgPaths.h b/toolsrc/include/VcpkgPaths.h index d55c95fe1..3c1955204 100644 --- a/toolsrc/include/VcpkgPaths.h +++ b/toolsrc/include/VcpkgPaths.h @@ -19,6 +19,7 @@ namespace vcpkg { fs::path dumpbin; fs::path vcvarsall; + std::vector<std::wstring> vcvarsall_options; CWStringView version; std::vector<ToolsetArchOption> supported_architectures; }; @@ -71,5 +72,6 @@ namespace vcpkg Lazy<fs::path> git_exe; Lazy<fs::path> nuget_exe; Lazy<std::vector<Toolset>> toolsets; + Lazy<std::vector<Toolset>> toolsets_vs2017_v140; }; } |