boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-01-19 04:02:14 +00:00
Code Issues Projects Releases Wiki Activity

Tweaks to msvc145 support.

Browse Source 
Additional changes from 3937e5a625 to: set correct VS180COMNTOOLS env var; add next prerelease msvc, make msvc143 default tool.
This commit is contained in:
Rene Rivera
2025-12-02 09:53:43 -06:00
parent a8dae852db
commit b5b93ac829
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/engine/config_toolset.bat
View File

@@ -168,8 +168,8 @@ call vswhere_usability_wrapper.cmd
REM Reset ERRORLEVEL since from now on it's all based on ENV vars
ver > nul 2> nul
if "_%B2_TOOLSET_ROOT%_" == "__" (
if NOT "_%VS170COMNTOOLS%_" == "__" (
set "B2_TOOLSET_ROOT=%VS170COMNTOOLS%..\..\VC\"
if NOT "_%VS180COMNTOOLS%_" == "__" (
set "B2_TOOLSET_ROOT=%VS180COMNTOOLS%..\..\VC\"
))
if "_%B2_ARCH%_" == "__" set B2_ARCH=%PROCESSOR_ARCHITECTURE%

17
src/engine/vswhere_usability_wrapper.cmd
View File

@@ -17,8 +17,8 @@ if errorlevel 1 goto :no-vswhere
set VSWHERE_REQ=-requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64
set VSWHERE_PRP=-property installationPath
REM Visual Studio Unknown Version, Beyond 2022
set VSWHERE_LMT=-version "[18.0,19.0)"
REM Visual Studio Unknown Version, Beyond 2026
set VSWHERE_LMT=-version "[19.0,20.0)"
set VSWHERE_PRERELEASE=-prerelease
SET VSWHERE_ARGS=-latest -products * %VSWHERE_REQ% %VSWHERE_PRP% %VSWHERE_LMT% %VSWHERE_PRERELEASE%
for /f "usebackq tokens=*" %%i in (`vswhere %VSWHERE_ARGS%`) do (
@@ -30,6 +30,19 @@ for /f "usebackq tokens=*" %%i in (`vswhere %VSWHERE_ARGS%`) do (
exit /B 0
)
REM Visual Studio 2026
set VSWHERE_LMT=-version "[18.0,19.0)"
set VSWHERE_PRERELEASE=-prerelease
SET VSWHERE_ARGS=-latest -products * %VSWHERE_REQ% %VSWHERE_PRP% %VSWHERE_LMT% %VSWHERE_PRERELEASE%
for /f "usebackq tokens=*" %%i in (`vswhere %VSWHERE_ARGS%`) do (
endlocal
echo Found with vswhere %%i
@rem comment out setting VCINSTALLDIR for Boost.build
@rem set "VCINSTALLDIR=%%i\VC\"
set "VS180COMNTOOLS=%%i\Common7\Tools\"
exit /B 0
)
REM Visual Studio 2022
set VSWHERE_LMT=-version "[17.0,18.0)"
set VSWHERE_PRERELEASE=-prerelease

4
src/tools/msvc.jam
View File

@@ -1790,11 +1790,11 @@ local rule default-path ( version )
{
limit = "-version \"[18.0,19.0)\" -prerelease" ;
}
else if $(version) = 14.3
else if $(version) = 14.3 || $(version) = "default"
{
limit = "-version \"[17.0,18.0)\" -prerelease" ;
}
else if $(version) = 14.2 || $(version) = "default"
else if $(version) = 14.2
{
limit = "-version \"[16.0,17.0)\"" ;
}