Skip to content

Commit

Permalink
Fix detection of VS 2013 in install script.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sibras committed Sep 8, 2017
1 parent 4a4e1dd commit e6f4d7a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions install_script.bat
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ if not ERRORLEVEL 1 (
set MSVC_VER=14
goto MSVCVarsDone
)
reg.exe query "HKLM\Software%WOWNODE%\Microsoft\VisualStudio\13.0" /v "InstallDir" >nul 2>&1
reg.exe query "HKLM\Software%WOWNODE%\Microsoft\VisualStudio\12.0" /v "InstallDir" >nul 2>&1
if not ERRORLEVEL 1 (
echo Visual Studio 2013 installation detected...
for /f "skip=2 tokens=2,*" %%a in ('reg.exe query "HKLM\Software%WOWNODE%\Microsoft\VisualStudio\13.0" /v "InstallDir"') do (set VSINSTALLDIR=%%b)
for /f "skip=2 tokens=2,*" %%a in ('reg.exe query "HKLM\Software%WOWNODE%\Microsoft\VisualStudio\12.0" /v "InstallDir"') do (set VSINSTALLDIR=%%b)
call "!VSINSTALLDIR!\VC\bin%MSVCVARSDIR%\vcvars%SYSARCH%.bat" >nul 2>&1
set MSVC_VER=13
set MSVC_VER=12
goto MSVCVarsDone
)
echo Error: Could not find valid Visual Studio installation!
Expand Down

0 comments on commit e6f4d7a

Please sign in to comment.