3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 22:58:00 +08:00
Code Issues Projects Releases Wiki Activity

[vcpkg] Add additional checks for 32-bit hosted and targetting windows store when using VS2019

Browse Source
This commit is contained in:
Robert Schumacher 2019-01-29 13:49:45 -08:00
parent 660745956a
commit 74e0c1a784
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
toolsrc/src/vcpkg/vcpkgpaths.cpp
View File

@ -192,6 +192,26 @@ namespace vcpkg
vs_root_path.generic_string());
}
if (prebuildinfo.cmake_system_name == "WindowsStore")
{
// For now, cmake does not support VS 2019 when using the MSBuild generator.
Util::erase_remove_if(candidates, [&](const Toolset* t) { return t->version == "v142"; });
Checks::check_exit(VCPKG_LINE_INFO,
!candidates.empty(),
"With the current CMake version, UWP binaries can only be built with toolset version "
"v141 or below. Please install the v141 toolset in VS 2019.");
}
if (System::get_host_processor() == System::CPUArchitecture::X86)
{
// For now, cmake does not support VS 2019 when using the MSBuild generator.
Util::erase_remove_if(candidates, [&](const Toolset* t) { return t->version == "v142"; });
Checks::check_exit(VCPKG_LINE_INFO,
!candidates.empty(),
"With the current CMake version, 32-bit machines can build with toolset version "
"v141 or below. Please install the v141 toolset in VS 2019.");
}
Checks::check_exit(VCPKG_LINE_INFO, !candidates.empty(), "No suitable Visual Studio instances were found");
return *candidates.front();