mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 04:53:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add "vcvarsall" support.

Browse Source
This commit is contained in:
Billy Robert O'Neal III 2020-03-10 23:58:58 -07:00
parent 347d8ef530
commit 52214665b2
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
toolsrc/src/vcpkg-test/system.cpp
View File

@ -122,6 +122,11 @@ TEST_CASE ("[from_cpu_architecture]", "system")
TEST_CASE ("[guess_visual_studio_prompt]", "system")
{
environment_variable_resetter reset_VSCMD_ARG_TGT_ARCH{"VSCMD_ARG_TGT_ARCH"};
environment_variable_resetter reset_VCINSTALLDIR{"VCINSTALLDIR"};
environment_variable_resetter reset_Platform{"Platform"};
set_environment_variable("Platform", "x86"); // ignored if VCINSTALLDIR unset
set_environment_variable("VCINSTALLDIR", nullopt);
set_environment_variable("VSCMD_ARG_TGT_ARCH", nullopt);
CHECK(!guess_visual_studio_prompt_target_architecture().has_value());
set_environment_variable("VSCMD_ARG_TGT_ARCH", "x86");
@ -134,6 +139,21 @@ TEST_CASE ("[guess_visual_studio_prompt]", "system")
CHECK(guess_visual_studio_prompt_target_architecture()
.value_or_exit(VCPKG_LINE_INFO) == CPUArchitecture::ARM);
set_environment_variable("VSCMD_ARG_TGT_ARCH", "arm64");
CHECK(guess_visual_studio_prompt_target_architecture().value_or_exit(VCPKG_LINE_INFO)
== CPUArchitecture::ARM64);
CHECK(guess_visual_studio_prompt_target_architecture()
.value_or_exit(VCPKG_LINE_INFO) == CPUArchitecture::ARM64);
// check that apparent "nested" prompts defer to "vsdevcmd"
set_environment_variable("VCINSTALLDIR", "anything");
CHECK(guess_visual_studio_prompt_target_architecture()
.value_or_exit(VCPKG_LINE_INFO) == CPUArchitecture::ARM64);
set_environment_variable("VSCMD_ARG_TGT_ARCH", nullopt);
set_environment_variable("Platform", nullopt);
CHECK(guess_visual_studio_prompt_target_architecture()
.value_or_exit(VCPKG_LINE_INFO) == CPUArchitecture::X86);
set_environment_variable("Platform", "x86");
CHECK(guess_visual_studio_prompt_target_architecture()
.value_or_exit(VCPKG_LINE_INFO) == CPUArchitecture::X86);
set_environment_variable("Platform", "x64");
CHECK(guess_visual_studio_prompt_target_architecture()
.value_or_exit(VCPKG_LINE_INFO) == CPUArchitecture::X64);
}

14
toolsrc/src/vcpkg/base/system.cpp
View File

@ -193,6 +193,20 @@ namespace vcpkg
return to_cpu_architecture(VSCMD_ARG_TGT_ARCH.value_or_exit(VCPKG_LINE_INFO));
}
// Check for the "vcvarsall" infrastructure used by Visual Studio 2015
if (System::get_environment_variable("VCINSTALLDIR"))
{
const auto Platform = System::get_environment_variable("Platform");
if (Platform)
{
return to_cpu_architecture(Platform.value_or_exit(VCPKG_LINE_INFO));
}
else
{
return CPUArchitecture::X86;
}
}
return nullopt;
}
}