From 3499a0820731c33769aa4a11fcafb4258300f360 Mon Sep 17 00:00:00 2001 From: Patrick Pelissier Date: Sat, 12 Mar 2022 11:50:17 +0100 Subject: [PATCH] Add support for MS Visual Studio 2022 --- tests/Make-check-cl.bat | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/Make-check-cl.bat b/tests/Make-check-cl.bat index b45d214f..2ba87591 100644 --- a/tests/Make-check-cl.bat +++ b/tests/Make-check-cl.bat @@ -22,7 +22,7 @@ REM SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. REM Execute the test suite for Microsoft Visual Studio REM -REM Load Micosoft Visual Studio environement file. +REM Load Micosoft Visual Studio environement file (2019 or 2022) IF EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" ( call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 ) @@ -30,6 +30,13 @@ IF EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxi call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 ) +IF EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" ( + call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 +) +IF EXIST "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ( + call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 +) + REM Add clang-cl in the PATH. It is the default install of clang for MSVC: REM %VCINSTALLDIR%\Tools\Llvm\bin;%VCINSTALLDIR%\Tools\Llvm\x64\bin REM Adding x64 version