GitLab CI: Switch the Windows builds to Qt 6.5.3
This commit is contained in:
parent
07f6b8d934
commit
a7872672c2
|
@ -163,7 +163,7 @@ variables:
|
|||
- $env:WIRESHARK_BASE_DIR = "C:\Development"
|
||||
- $env:Configuration = "RelWithDebInfo"
|
||||
- $env:Path += ";C:\Program Files\CMake\bin"
|
||||
- $env:CMAKE_PREFIX_PATH = "C:\qt\6.5.2\msvc2019_64"
|
||||
- $env:CMAKE_PREFIX_PATH = "C:\qt\6.5.3\msvc2019_64"
|
||||
# https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell
|
||||
- cmd.exe /c "call `"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat`" && set > %temp%\vcvars.txt"
|
||||
- Get-Content "$env:temp\vcvars.txt" | Foreach-Object { if ($_ -match "^(.*?)=(.*)$") { Set-Content "env:\$($matches[1])" $matches[2] } }
|
||||
|
@ -409,8 +409,7 @@ Windows x64 Package:
|
|||
before_script:
|
||||
- $env:WIRESHARK_BASE_DIR = "C:\Development"
|
||||
- $env:Configuration = "RelWithDebInfo"
|
||||
- $env:Path += ";C:\Program Files\Amazon\AWSCLIV2"
|
||||
- $env:CMAKE_PREFIX_PATH = "C:\Qt\6.5.2\msvc2019_64"
|
||||
- $env:CMAKE_PREFIX_PATH = "C:\Qt\6.5.3\msvc2019_64"
|
||||
# https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell
|
||||
- cmd.exe /c "call `"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat`" && set > %temp%\vcvars.txt"
|
||||
- Get-Content "$env:temp\vcvars.txt" | Foreach-Object { if ($_ -match "^(.*?)=(.*)$") { Set-Content "env:\$($matches[1])" $matches[2] } }
|
||||
|
@ -447,8 +446,7 @@ Windows Arm64 Package:
|
|||
before_script:
|
||||
- $env:WIRESHARK_BASE_DIR = "C:\Development"
|
||||
- $env:Configuration = "RelWithDebInfo"
|
||||
#- $env:Path += ";C:\Program Files\Amazon\AWSCLIV2"
|
||||
- $env:CMAKE_PREFIX_PATH = "C:\Qt\6.5.2\msvc2019_arm64"
|
||||
- $env:CMAKE_PREFIX_PATH = "C:\Qt\6.5.3\msvc2019_arm64"
|
||||
# https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell
|
||||
- cmd.exe /c "call `"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsarm64.bat`" && set > %temp%\vcvars.txt"
|
||||
- Get-Content "$env:temp\vcvars.txt" | Foreach-Object { if ($_ -match "^(.*?)=(.*)$") { Set-Content "env:\$($matches[1])" $matches[2] } }
|
||||
|
|
Loading…
Reference in New Issue