diff options
| author | jasjuang <jasjuang@gmail.com> | 2017-09-27 22:21:17 -0700 |
|---|---|---|
| committer | jasjuang <jasjuang@gmail.com> | 2017-09-27 22:21:17 -0700 |
| commit | 7e6da0c9e7cd4cfea6c88ca661d509e6f15a1a8c (patch) | |
| tree | 957a5d0b1130e64ac6428b06e8758237cbafe5f4 /toolsrc/include | |
| parent | 050a8bf6179ed046508b8a97e62894475a46dfbc (diff) | |
| parent | 0ccea4f3677d92a20935e03c2cb301d8300b43d1 (diff) | |
| download | vcpkg-7e6da0c9e7cd4cfea6c88ca661d509e6f15a1a8c.tar.gz vcpkg-7e6da0c9e7cd4cfea6c88ca661d509e6f15a1a8c.zip | |
Merge remote-tracking branch 'upstream/master'
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; }; } |