2
0
mirror of https://github.com/boostorg/build.git synced 2026-02-14 00:32:11 +00:00

Merge remote-tracking branch 'upstream/develop' into common_program_files

This commit is contained in:
Thomas Kent
2017-03-15 06:56:56 -05:00

View File

@@ -113,10 +113,11 @@ if errorlevel 1 (
call :Clear_Error
SET cl141cmd="%~dp0..\tools\vc141helper\cl141_path.cmd"
for /F "tokens=*" %%A IN ('cmd /D /S /C "%cl141cmd% InstallationPath"') DO if NOT "_%%A_" == "__" (
if errorlevel 1 goto :eof
if errorlevel 1 goto :VCFind_Error
set "BOOST_JAM_TOOLSET=vc1410"
set "BOOST_JAM_TOOLSET_ROOT=%%A\VC\"
goto :eof)
:VCFind_Error
call :Clear_Error
if EXIST "%VS_ProgramFiles%\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" (
set "BOOST_JAM_TOOLSET=vc1410"