diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-10-05 13:51:28 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-10-05 18:27:07 -0700 |
| commit | 9a963f7eff1981d4e894ea8b297d092cda60b764 (patch) | |
| tree | ab7da468d01a9e4e18dbbd84aa7f6597695700c1 /toolsrc/include/VcpkgPaths.h | |
| parent | 7f68aa6630f96f474e85cd332dbbdc1ce6226d50 (diff) | |
| download | vcpkg-9a963f7eff1981d4e894ea8b297d092cda60b764.tar.gz vcpkg-9a963f7eff1981d4e894ea8b297d092cda60b764.zip | |
Overhaul VS selection. Add triplet option to specify VS instance
Diffstat (limited to 'toolsrc/include/VcpkgPaths.h')
| -rw-r--r-- | toolsrc/include/VcpkgPaths.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/toolsrc/include/VcpkgPaths.h b/toolsrc/include/VcpkgPaths.h index 4b4527434..d4640fba2 100644 --- a/toolsrc/include/VcpkgPaths.h +++ b/toolsrc/include/VcpkgPaths.h @@ -17,6 +17,7 @@ namespace vcpkg struct Toolset { + fs::path visual_studio_root_path; fs::path dumpbin; fs::path vcvarsall; std::vector<std::wstring> vcvarsall_options; @@ -66,7 +67,8 @@ namespace vcpkg /// <remarks> /// Valid version strings are "v140", "v141", and "". Empty string gets the latest. /// </remarks> - const Toolset& get_toolset(const std::string& toolset_version) const; + const Toolset& VcpkgPaths::get_toolset(const Optional<std::string>& toolset_version, + const Optional<fs::path>& visual_studio_path) const; Files::Filesystem& get_filesystem() const; @@ -78,6 +80,5 @@ namespace vcpkg Lazy<fs::path> ifw_binarycreator_exe; Lazy<fs::path> ifw_repogen_exe; Lazy<std::vector<Toolset>> toolsets; - Lazy<std::vector<Toolset>> toolsets_vs2017_v140; }; } |