update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / tools / build / src / engine / vswhere_usability_wrapper.cmd

diff --git a/ceph/src/boost/tools/build/src/engine/vswhere_usability_wrapper.cmd b/ceph/src/boost/tools/build/src/engine/vswhere_usability_wrapper.cmd
index 88ca79693a6cd81e59fb567a53c5d60a3318bde4..cc758e82e0b75a25611b2b799b0f829dee762f0f 100644 (file)
--- a/ceph/src/boost/tools/build/src/engine/vswhere_usability_wrapper.cmd
+++ b/ceph/src/boost/tools/build/src/engine/vswhere_usability_wrapper.cmd
@@ -17,8 +17,8 @@ if errorlevel 1 goto :no-vswhere
 set VSWHERE_REQ=-requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64\r
 set VSWHERE_PRP=-property installationPath\r
 \r
-REM Visual Studio Unknown Version, Beyond 2019\r
-set VSWHERE_LMT=-version "[17.0,18.0)"\r
+REM Visual Studio Unknown Version, Beyond 2022\r
+set VSWHERE_LMT=-version "[18.0,19.0)"\r
 set VSWHERE_PRERELEASE=-prerelease\r
 SET VSWHERE_ARGS=-latest -products * %VSWHERE_REQ% %VSWHERE_PRP% %VSWHERE_LMT% %VSWHERE_PRERELEASE%\r
 for /f "usebackq tokens=*" %%i in (`vswhere %VSWHERE_ARGS%`) do (\r
@@ -30,9 +30,22 @@ for /f "usebackq tokens=*" %%i in (`vswhere %VSWHERE_ARGS%`) do (
     exit /B 0\r
 )\r
 \r
+REM Visual Studio 2022\r
+set VSWHERE_LMT=-version "[17.0,18.0)"\r
+set VSWHERE_PRERELEASE=-prerelease\r
+SET VSWHERE_ARGS=-latest -products * %VSWHERE_REQ% %VSWHERE_PRP% %VSWHERE_LMT% %VSWHERE_PRERELEASE%\r
+for /f "usebackq tokens=*" %%i in (`vswhere %VSWHERE_ARGS%`) do (\r
+    endlocal\r
+       echo Found with vswhere %%i\r
+    @rem comment out setting VCINSTALLDIR for Boost.build\r
+    @rem set "VCINSTALLDIR=%%i\VC\"\r
+    set "VS170COMNTOOLS=%%i\Common7\Tools\"\r
+    exit /B 0\r
+)\r
+\r
 REM Visual Studio 2019 (16.X, toolset 14.2)\r
 set VSWHERE_LMT=-version "[16.0,17.0)"\r
-SET VSWHERE_ARGS=-latest -products * %VSWHERE_REQ% %VSWHERE_PRP% %VSWHERE_LMT%\r
+SET VSWHERE_ARGS=-latest -products * %VSWHERE_REQ% %VSWHERE_PRP% %VSWHERE_LMT% %VSWHERE_PRERELEASE%\r
 for /f "usebackq tokens=*" %%i in (`vswhere %VSWHERE_ARGS%`) do (\r
     endlocal\r
        echo Found with vswhere %%i\r
@@ -57,4 +70,4 @@ for /f "usebackq tokens=*" %%i in (`vswhere %VSWHERE_ARGS%`) do (
 :no-vswhere\r
 endlocal\r
 echo could not find "vswhere"\r
-exit /B 1
\ No newline at end of file
+exit /B 1\r