Skip to content

Commit

Permalink
Merge pull request #5152 from ShifftC/dev
Browse files Browse the repository at this point in the history
Update to #4800
  • Loading branch information
waruqi authored May 27, 2024
2 parents d1c2095 + 56ea43c commit 707bfc3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions xmake/modules/package/tools/cmake.lua
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

0 comments on commit 707bfc3

Please sign in to comment.