From aeffa625e55eea41a86a728c14a95d05bc3de0e9 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Date: Sat, 28 Mar 2020 04:19:53 +0100
Subject: [vcpkg] Add the possibility to load vcvars.bat with external
 toolchain.  (#10399)

* Add VCPKG_LOAD_VCVARS_ENV
allow loading vcvars.bat if an external toolchain file is used.

* add documentation
---
 toolsrc/include/vcpkg/build.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'toolsrc/include')

diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h
index d36b64143..892fb2370 100644
--- a/toolsrc/include/vcpkg/build.h
+++ b/toolsrc/include/vcpkg/build.h
@@ -153,6 +153,7 @@ namespace vcpkg::Build
                      Triplet triplet,
                      const std::unordered_map<std::string, std::string>& cmakevars);
 
+        bool load_vcvars_env;
         std::string triplet_abi_tag;
         std::string target_architecture;
         std::string cmake_system_name;
@@ -179,6 +180,7 @@ namespace vcpkg::Build
         BUILD_TYPE,
         ENV_PASSTHROUGH,
         PUBLIC_ABI_OVERRIDE,
+        LOAD_VCVARS_ENV,
     };
 
     const std::unordered_map<std::string, VcpkgTripletVar> VCPKG_OPTIONS = {
@@ -191,6 +193,7 @@ namespace vcpkg::Build
         {"VCPKG_BUILD_TYPE", VcpkgTripletVar::BUILD_TYPE},
         {"VCPKG_ENV_PASSTHROUGH", VcpkgTripletVar::ENV_PASSTHROUGH},
         {"VCPKG_PUBLIC_ABI_OVERRIDE", VcpkgTripletVar::PUBLIC_ABI_OVERRIDE},
+        {"VCPKG_LOAD_VCVARS_ENV", VcpkgTripletVar::LOAD_VCVARS_ENV},
     };
 
     struct ExtendedBuildResult
-- 
cgit v1.2.3