Implement support to request a specific toolset version via the variable `VCPKG_PLATFORM_TOOLSET` in the triplet file
MODIFY
include/VcpkgPaths.h
include/VcpkgPaths.h
@@ -48,7 +48,10 @@ 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;
+ const std::vector<Toolset>& get_toolsets() const;
+
+ const Toolset& get_latest_toolset() const;
+ const Toolset& get_toolset(const std::string& toolset_version) const;
Files::Filesystem& get_filesystem() const;
@@ -56,6 +59,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;
};
}

MODIFY
src/PostBuildLint.cpp
src/PostBuildLint.cpp
@@ -733,7 +733,7 @@ namespace vcpkg::PostBuildLint
const auto& fs = paths.get_filesystem();
// for dumpbin
- const Toolset& toolset = paths.get_toolset();
+ const Toolset& toolset = paths.get_toolset(pre_build_info.platform_toolset);
const fs::path package_dir = paths.package_dir(spec);
size_t error_count = 0;

MODIFY
src/VcpkgPaths.cpp
src/VcpkgPaths.cpp
@@ -269,7 +269,7 @@ namespace vcpkg
return nullopt;
}
- static Toolset find_toolset_instance(const VcpkgPaths& paths)
+ static std::vector<Toolset> find_toolset_instances(const VcpkgPaths& paths)
{
const auto& fs = paths.get_filesystem();
@@ -277,7 +277,10 @@ namespace vcpkg
// Note: this will contain a mix of vcvarsall.bat locations and dumpbin.exe locations.
std::vector<fs::path> paths_examined;
+ std::vector<Toolset> found_toolsets;
+
// VS2017
+ Optional<Toolset> vs2017_toolset;
for (const fs::path& instance : vs2017_installation_instances)
{
const fs::path vc_dir = instance / "VC";
@@ -303,9 +306,15 @@ namespace vcpkg
paths_examined.push_back(dumpbin_path);
if (fs.exists(dumpbin_path))
{
- return {dumpbin_path, vcvarsall_bat, L"v141"};
+ vs2017_toolset = Toolset{dumpbin_path, vcvarsall_bat, L"v141"};
+ break;
+ }
}
+ if(vs2017_toolset) break;
}
+ if(auto value = vs2017_toolset.get())
+ {
+ found_toolsets.push_back(*value);
}
// VS2015
@@ -321,11 +330,17 @@ namespace vcpkg
paths_examined.push_back(vs2015_dumpbin_exe);
if (fs.exists(vs2015_dumpbin_exe))
{
- return {vs2015_dumpbin_exe, vs2015_vcvarsall_bat, L"v140"};
+ found_toolsets.push_back({vs2015_dumpbin_exe, vs2015_vcvarsall_bat, L"v140"});
}
}
}
+ std::sort(found_toolsets.begin(),
+ found_toolsets.end(),
+ [](const Toolset& left, const Toolset& right) { return left.version > right.version; });
+
+ if(found_toolsets.empty())
+ {
System::println(System::Color::error, "Could not locate a complete toolset.");
System::println("The following paths were examined:");
for(const fs::path& path : paths_examined)
@@ -335,9 +350,37 @@ namespace vcpkg
Checks::exit_fail(VCPKG_LINE_INFO);
}
- const Toolset& VcpkgPaths::get_toolset() const
+ return found_toolsets;
+ }
+
+ const std::vector<Toolset>& VcpkgPaths::get_toolsets() const
+ {
+ return this->toolsets.get_lazy([this]() { return find_toolset_instances(*this); });
+ }
+
+ const Toolset& VcpkgPaths::get_latest_toolset() const
{
- return this->toolset.get_lazy([this]() { return find_toolset_instance(*this); });
+ // Invariant: toolsets are non-empty and sorted
+ return get_toolsets().back();
}
+ const Toolset& VcpkgPaths::get_toolset(const std::string& toolset_version) const
+ {
+ if(toolset_version.empty())
+ {
+ return this->get_latest_toolset();
+ }
+ else
+ {
+ const auto& vs_toolsets = this->get_toolsets();
+
+ const auto toolset = Util::find_if(vs_toolsets, [&](const Toolset& toolset) { return toolset_version == Strings::to_utf8(toolset.version); });
+ if(toolset == vs_toolsets.end())
+ {
+ Checks::exit_with_message(VCPKG_LINE_INFO, Strings::format("Could not find toolset %s", toolset_version));
+ }
+ return *toolset;
+ }
+ }
+
Files::Filesystem& VcpkgPaths::get_filesystem() const { return Files::get_real_filesystem(); }
}

MODIFY
src/commands_env.cpp
src/commands_env.cpp
@@ -13,7 +13,7 @@ namespace vcpkg::Commands::Env
args.check_and_get_optional_command_arguments({});
auto pre_build_info = Build::PreBuildInfo::from_triplet_file(paths, default_triplet);
- System::cmd_execute_clean(Build::make_build_env_cmd(pre_build_info, paths.get_toolset()) + L" && cmd");
+ System::cmd_execute_clean(Build::make_build_env_cmd(pre_build_info, paths.get_toolset(pre_build_info.platform_toolset)) + L" && cmd");
Checks::exit_success(VCPKG_LINE_INFO);
}

MODIFY
src/vcpkg_Build.cpp
src/vcpkg_Build.cpp
@@ -128,8 +128,8 @@ namespace vcpkg::Build
const fs::path& git_exe_path = paths.get_git_exe();
const fs::path ports_cmake_script_path = paths.ports_cmake;
- const Toolset& toolset = paths.get_toolset();
auto pre_build_info = PreBuildInfo::from_triplet_file(paths, triplet);
+ const Toolset& toolset = paths.get_toolset(pre_build_info.platform_toolset);
const auto cmd_set_environment = make_build_env_cmd(pre_build_info, toolset);
const std::wstring cmd_launch_cmake =

Implement support to request a specific toolset version via the variable `VCPKG_PLATFORM_TOOLSET` in the triplet file