From 141f10801c2fae8ab844e94fe5338d055892c0ac Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Sat, 25 Nov 2017 11:49:15 -0800
Subject: [vcpkg] Improve external toolchain handling.

---
 toolsrc/include/vcpkg/build.h      | 1 +
 toolsrc/include/vcpkg/vcpkgpaths.h | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'toolsrc/include')

diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h
index 1f6782ccf..09e74905f 100644
--- a/toolsrc/include/vcpkg/build.h
+++ b/toolsrc/include/vcpkg/build.h
@@ -89,6 +89,7 @@ namespace vcpkg::Build
         std::string cmake_system_version;
         Optional<std::string> platform_toolset;
         Optional<fs::path> visual_studio_path;
+        Optional<std::string> external_toolchain_file;
     };
 
     std::string make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset);
diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h
index 0790be785..33a9b0067 100644
--- a/toolsrc/include/vcpkg/vcpkgpaths.h
+++ b/toolsrc/include/vcpkg/vcpkgpaths.h
@@ -26,6 +26,11 @@ namespace vcpkg
         std::vector<ToolsetArchOption> supported_architectures;
     };
 
+    namespace Build
+    {
+        struct PreBuildInfo;
+    }
+
     struct VcpkgPaths
     {
         static Expected<VcpkgPaths> create(const fs::path& vcpkg_root_dir);
@@ -69,8 +74,7 @@ namespace vcpkg
         /// <remarks>
         ///   Valid version strings are "v120", "v140", "v141", and "". Empty string gets the latest.
         /// </remarks>
-        const Toolset& get_toolset(const Optional<std::string>& toolset_version,
-                                   const Optional<fs::path>& visual_studio_path) const;
+        const Toolset& get_toolset(const Build::PreBuildInfo& prebuildinfo) const;
 
         Files::Filesystem& get_filesystem() const;
 
-- 
cgit v1.2.3