diff options
| author | ruki <[email protected]> | 2024-05-27 23:18:53 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-05-27 23:18:53 +0800 |
| commit | 707bfc36f9b4a14c42bde2cb115d86b33218bcc9 (patch) | |
| tree | 1dd752ee51cc9e49fcccf17845d151baa33e3140 | |
| parent | d1c2095855bcf6633aeffac98c1b03bca0978f8a (diff) | |
| parent | 56ea43c86393d27cc5c3eeb9c90439a299ce0900 (diff) | |
Merge pull request #5152 from ShifftC/dev
Update to #4800
| -rw-r--r-- | xmake/modules/package/tools/cmake.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index df9306436..9c54fddb5 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -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 |