diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-06-05 22:02:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-05 22:02:51 -0700 |
| commit | 4c33195759bfc2b3bde8628a6617f46040721330 (patch) | |
| tree | d65e6fa538d5efe022a5886a16adc8c5984a9b94 /toolsrc/include | |
| parent | 77e556a18622fdce4d9ea6c8230c11c5cf9ce3f6 (diff) | |
| parent | 60825eed0e8b8c7646d0e66bc2743b4a1e8e4a96 (diff) | |
| download | vcpkg-4c33195759bfc2b3bde8628a6617f46040721330.tar.gz vcpkg-4c33195759bfc2b3bde8628a6617f46040721330.zip | |
Merge pull request #1213 from albertziegenhagel/request-toolset-version
Specify toolset version
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/VcpkgPaths.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/toolsrc/include/VcpkgPaths.h b/toolsrc/include/VcpkgPaths.h index 25c1728b9..95cd4bc28 100644 --- a/toolsrc/include/VcpkgPaths.h +++ b/toolsrc/include/VcpkgPaths.h @@ -48,7 +48,12 @@ namespace vcpkg const fs::path& get_cmake_exe() const; const fs::path& get_git_exe() const; const fs::path& get_nuget_exe() const; - const Toolset& get_toolset() const; + + /// <summary>Retrieve a toolset matching a VS version</summary> + /// <remarks> + /// Valid version strings are "v140", "v141", and "". Empty string gets the latest. + /// </remarks> + const Toolset& get_toolset(const std::string& toolset_version) const; Files::Filesystem& get_filesystem() const; @@ -56,6 +61,6 @@ namespace vcpkg Lazy<fs::path> cmake_exe; Lazy<fs::path> git_exe; Lazy<fs::path> nuget_exe; - Lazy<Toolset> toolset; + Lazy<std::vector<Toolset>> toolsets; }; } |