tools: vsvarsall.bat: cleanup and restrict to VS2019

This commit is contained in:
Bill Zissimopoulos 2022-03-25 15:37:18 +00:00
parent d816d607f4
commit 9ecb6541cf

View File

@ -1,16 +1,24 @@
@echo off @echo off
set vcvarsall="%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" set vcvarsall=""
set vswhere="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" set vswhere="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
if exist %vswhere% ( if exist %vswhere% (
for /f "usebackq tokens=*" %%i in (`%vswhere% -latest -find VC\**\vcvarsall.bat`) do ( for /f "usebackq tokens=*" %%i in (`%vswhere% -version [15.0^,17.0^) -find VC\**\vcvarsall.bat`) do (
if exist "%%i" ( set vcvarsall="%%i"
set vcvarsall="%%i" )
) else ( )
for /f "usebackq tokens=*" %%i in (`%vswhere% -latest -property installationPath`) do (
set vcvarsall="%%i\VC\Auxiliary\Build\vcvarsall.bat" if not exist %vcvarsall% (
) if exist %vswhere% (
for /f "usebackq tokens=*" %%i in (`%vswhere% -version [15.0^,17.0^) -property installationPath`) do (
set vcvarsall="%%i\VC\Auxiliary\Build\vcvarsall.bat"
) )
) )
) )
if not exist %vcvarsall% (
set vcvarsall="%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat"
)
call %vcvarsall% %* call %vcvarsall% %*