diff options
| -rw-r--r-- | xmake/modules/detect/sdks/find_vstudio.lua | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/xmake/modules/detect/sdks/find_vstudio.lua b/xmake/modules/detect/sdks/find_vstudio.lua index 5ed3b310c..eb6c565a9 100644 --- a/xmake/modules/detect/sdks/find_vstudio.lua +++ b/xmake/modules/detect/sdks/find_vstudio.lua @@ -152,13 +152,40 @@ function main() , ["4.2"] = "VS42COMNTOOLS" } - -- find vs from environment variables + -- find the single current MSVC/VS from environment variables local VCInstallDir = os.getenv("VCInstallDir") - local VisualStudioVersion = os.getenv("VisualStudioVersion") - if VCInstallDir and VisualStudioVersion then + if VCInstallDir and (VCInstallDir ~= "") then + local VisualStudioVersion = os.getenv("VisualStudioVersion") + if not VisualStudioVersion or (VisualStudioVersion == "") then - -- find vcvarsall.bat - local vcvarsall = path.join(VCInstallDir, "Auxiliary", "Build", "vcvarsall.bat") + -- heuristic for VisualStudioVersion value (early MSVC/VS versions don't set VisualStudioVersion) + local VSInstallDir = os.getenv("VSInstallDir") or "" + VisualStudioVersion = VSInstallDir:match('(%d+[.]?%d*)\\?%s*$') + if not VisualStudioVersion then VisualStudioVersion = VCInstallDir:match('(%d+[.]?%d*)\\VC\\?%s*$') end + if not VisualStudioVersion then VisualStudioVersion = "0" end + if not VisualStudioVersion:match('[.]') then VisualStudioVersion = VisualStudioVersion .. '.0' end + + -- find highest known version which is less than or equal to VisualStudioVersion + if not vsvers[VisualStudioVersion] then + local versions = {} + local count = 0 + for k in pairs(vsvers) do table.insert(versions, tonumber(k)); count = count + 1 end + table.sort(versions) + local i = 0 + local v = tonumber(VisualStudioVersion) + while ((i < count) and (versions[i+1] <= v)) do i = i + 1 end + VisualStudioVersion = versions[i] or "0" + end + end + + -- find vcvarsall.bat or vcvars32.bat + local pathes = + { + VCInstallDir.."\\Auxiliary\\Build", + VCInstallDir.."\\bin", + VCInstallDir + } + local vcvarsall = find_file("vcvarsall.bat", pathes) or find_file("vcvars32.bat", pathes) if os.isfile(vcvarsall) then -- load vcvarsall |