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

Jump to bottom

fixbug: for cases when WindowsSDKVersion variable is not available #5411

Merged
merged 2 commits into from
Jul 31, 2024
Merged

fixbug: for cases when WindowsSDKVersion variable is not available #5411

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d40756d
fixbug: for cases when WindowsSDKVersion variable is not available
jinke18 Jul 29, 2024
ad6f760
make pattern more strict
jinke18 Jul 30, 2024
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
10 changes: 10 additions & 0 deletions xmake/modules/detect/sdks/find_vstudio.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,16 @@ function _load_vcvarsall(vcvarsall, vsver, arch, opt)
if WindowsSDKVersion ~= "" then
variables["WindowsSDKVersion"] = WindowsSDKVersion
end
else
-- sometimes the variable `WindowsSDKVersion` is not available
-- then parse it from `WindowsSdkBinPath`, such as: `C:\\Program Files (x86)\\Windows Kits\\8.1\\bin`
local WindowsSdkBinPath = variables["WindowsSdkBinPath"]
if WindowsSdkBinPath then
WindowsSDKVersion = string.match(WindowsSdkBinPath, "\\(%d+%.%d+)\\bin$")
if WindowsSDKVersion then
variables["WindowsSDKVersion"] = WindowsSDKVersion
end
end
end

-- fix UCRTVersion
Expand Down
Loading