diff options
| -rw-r--r-- | xmake/modules/detect/sdks/find_vstudio.lua | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/xmake/modules/detect/sdks/find_vstudio.lua b/xmake/modules/detect/sdks/find_vstudio.lua index 2ce2b44eb..ca49d8d07 100644 --- a/xmake/modules/detect/sdks/find_vstudio.lua +++ b/xmake/modules/detect/sdks/find_vstudio.lua @@ -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 |