diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-03-28 04:19:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 20:19:53 -0700 |
| commit | aeffa625e55eea41a86a728c14a95d05bc3de0e9 (patch) | |
| tree | bac415cdf3679c1bf8122cd7a614af05302f9e96 /toolsrc/include | |
| parent | cd4c0661161bb14b1d401a378fc1326c400a454c (diff) | |
| download | vcpkg-aeffa625e55eea41a86a728c14a95d05bc3de0e9.tar.gz vcpkg-aeffa625e55eea41a86a728c14a95d05bc3de0e9.zip | |
[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
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/build.h | 3 |
1 files changed, 3 insertions, 0 deletions
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 |