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

Remove Addtional checks since CMake support vs2019 now (#6265)

Browse Source 
Remove Addtional checks since CMake support vs2019 now
This commit is contained in:
Phoebe 2019-05-02 06:11:35 +08:00 committed by Curtis J Bezault
parent df753fbcf5
commit d3c18ed57e
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,26 +192,6 @@ namespace vcpkg
vs_root_path.generic_string()); 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"); Checks::check_exit(VCPKG_LINE_INFO, !candidates.empty(), "No suitable Visual Studio instances were found");
return *candidates.front(); return *candidates.front();