Fix path in case of Microsoft Visual Studio 2022.

This commit is contained in:
Roman Telezhynskyi 2023-06-26 10:33:23 +03:00
parent 9f04b0feb3
commit edd15cbbc0

View File

@ -179,7 +179,7 @@ environment:
BUILD_SYSTEM: "qbs" BUILD_SYSTEM: "qbs"
QMAKE: qmake.exe QMAKE: qmake.exe
ENABLE_PCH: true ENABLE_PCH: true
MSVC_PATH: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\MSVC\\14.29.30133\\bin\\Hostx64\\x64" MSVC_PATH: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\MSVC\\14.35.32215\\bin\\Hostx64\\x64"
ARCH: x64 ARCH: x64
PYTHON: "C:\\Python311-x64" PYTHON: "C:\\Python311-x64"
PLATFORM: "Windows10+" PLATFORM: "Windows10+"
@ -355,11 +355,11 @@ for:
if ($env:COMPILER -eq "msvc") { if ($env:COMPILER -eq "msvc") {
if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2022") { if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2022") {
if ($env:ARCH -eq "x64") { if ($env:ARCH -eq "x64") {
cmd.exe /c "call `"C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat`" && set > %temp%\vcvars.txt" cmd.exe /c "call `"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat`" && set > %temp%\vcvars.txt"
} elseif ($env:ARCH -eq "arm64") { } elseif ($env:ARCH -eq "arm64") {
cmd.exe /c "call `"C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat`" && set > %temp%\vcvars.txt" cmd.exe /c "call `"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat`" && set > %temp%\vcvars.txt"
} else { } else {
cmd.exe /c "call `"C:\Program Files (x86)\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat`" && set > %temp%\vcvars.txt" cmd.exe /c "call `"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat`" && set > %temp%\vcvars.txt"
} }
} elseif ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2019") { } elseif ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2019") {
if ($env:ARCH -eq "x64") { if ($env:ARCH -eq "x64") {