Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to #4800 #5152

Merged
merged 1 commit into from
May 27, 2024
Merged

Update to #4800 #5152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions xmake/modules/package/tools/cmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,11 +298,11 @@ function _get_vs_toolset(package)
toolset_ver = "v" .. verinfo[1] .. (verinfo[2]:sub(1, 1) or "0")
end
end
-- cmake does not support vs toolset v144 below 3.29.0, we can only use v143
-- cmake does not support vs toolset v144 below 3.29.3, we can only use v143
-- @see https://github.com/xmake-io/xmake/issues/4772
if toolset_ver and toolset_ver >= "v144" then
local cmake_version = _get_cmake_version()
if cmake_version and cmake_version:le("3.29.0") then
if cmake_version and cmake_version:le("3.29.3") then
toolset_ver = "v143"
end
end
Expand Down
Loading