diff options
| author | Phoebe <925731795@qq.com> | 2019-05-02 06:11:35 +0800 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-05-01 15:11:35 -0700 |
| commit | d3c18ed57e2ed58f922e556bbe1f50a88ea7c716 (patch) | |
| tree | 416ba71ce895e91527564ed146729e1701421e27 /toolsrc/src | |
| parent | df753fbcf502574e182e302607d5db0fe9188cfd (diff) | |
| download | vcpkg-d3c18ed57e2ed58f922e556bbe1f50a88ea7c716.tar.gz vcpkg-d3c18ed57e2ed58f922e556bbe1f50a88ea7c716.zip | |
Remove Addtional checks since CMake support vs2019 now (#6265)
Remove Addtional checks since CMake support vs2019 now
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg/vcpkgpaths.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index 0f99e01d3..512bcfc35 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -192,26 +192,6 @@ 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(); |