summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xmake/modules/detect/sdks/find_vstudio.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/xmake/modules/detect/sdks/find_vstudio.lua b/xmake/modules/detect/sdks/find_vstudio.lua
index a169b51a5..2778846b8 100644
--- a/xmake/modules/detect/sdks/find_vstudio.lua
+++ b/xmake/modules/detect/sdks/find_vstudio.lua
@@ -79,7 +79,9 @@ function _load_vcvarsall(vcvarsall, arch)
local WindowsSDKVersion = variables["WindowsSDKVersion"]
if WindowsSDKVersion then
WindowsSDKVersion = WindowsSDKVersion:gsub("\\", ""):trim()
- variables["WindowsSDKVersion"] = WindowsSDKVersion
+ if WindowsSDKVersion ~= "" then
+ variables["WindowsSDKVersion"] = WindowsSDKVersion
+ end
end
-- fix UCRTVersion
@@ -87,7 +89,7 @@ function _load_vcvarsall(vcvarsall, arch)
-- @note vcvarsall.bat maybe detect error if install WDK and SDK at same time (multi-sdk version exists in include directory).
--
local UCRTVersion = variables["UCRTVersion"]
- if UCRTVersion and UCRTVersion ~= WindowsSDKVersion then
+ if UCRTVersion and UCRTVersion ~= WindowsSDKVersion and WindowsSDKVersion ~= "" then
local lib = variables["lib"]
if lib then
lib = lib:gsub(UCRTVersion, WindowsSDKVersion)