Bump vcpkg version

The old version doesn't support MSVC 17.10 toolchain, so we cannot
build for arm64.

Change-Id: I63df5b61d6d7e06ee49f46f77528021f3ce5be47
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexey Edelev
2024-07-30 15:49:33 +02:00
parent 6569f201c1
commit 80eae8fe74
5 changed files with 10 additions and 5 deletions

View File

@@ -23,7 +23,7 @@ nonDottedReleaseTag=${vcpkgVersion//-/}
vcpkgToolOfficialUrl="https://github.com/microsoft/vcpkg-tool/archive/refs/tags/$vcpkgToolReleaseTag.tar.gz"
vcpkgToolCacheUrl="http://ci-files01-hki.ci.qt.io/input/vcpkg/vcpkg-tool-$nonDottedReleaseTag.tar.gz"
vcpkgToolSHA1="c6029714fca0304779f10c9c1cbe4b061a2fd945"
vcpkgToolSHA1="99a31b0bed2845f5c915735121d34c453126ec76"
vcpkgToolSourceFolder="$HOME/vcpkg-tool-$vcpkgToolReleaseTag"
vcpkgToolBuildFolder="$HOME/vcpkg-tool-$vcpkgToolReleaseTag/build"

View File

@@ -1 +1,2 @@
https://git.qt.io/aledelev/vcpkg.git
https://git.qt.io/mrmsdbdl/vcpkg-mirror.git

View File

@@ -1 +1 @@
vcpkg_tool_release_tag=2023-11-16
vcpkg_tool_release_tag=2024-09-18

View File

@@ -1 +1 @@
vcpkg_version=2023.10.19
vcpkg_version=2024.08.23

View File

@@ -34,9 +34,9 @@ if($arch -eq "x64") {
}
if($arch -eq "x64") {
$vcpkgExeSHA1 = "F74DCDE7F6F5082EF6DC31FED486FAD69BE8D442"
$vcpkgExeSHA1 = "484373186A905E9F39FE385F4FB59F263B9FFE95"
} elseif($arch -eq "arm64") {
$vcpkgExeSHA1 = "75049DC9A6FB813EFB7B48B2140DE067E73E977C"
$vcpkgExeSHA1 = "E0C4CBCD64B867CE386886806D8CA9C84610545F"
}
$vcpkgExeOfficialUrl = "https://github.com/microsoft/vcpkg-tool/releases/download/$vcpkgExeReleaseTag/vcpkg$suffix.exe"
@@ -55,6 +55,10 @@ if(![System.IO.File]::Exists("$vcpkgRoot\vcpkg.exe")){
# Disable telemetry
Set-Content -Value "" -Path "$vcpkgRoot\vcpkg.disable-metrics" -Force
# Bootstrap vcpkg
Set-Location -Path "$vcpkgRoot"
cmd.exe /c "$vcpkgRoot\bootstrap-vcpkg.bat"
# Setting VCPKG_ROOT using Set-EnvironmentVariable makes the variable only
# available during build time. In order to make it available during the
# provisioning, we need to directly set it via $env:VCPKG_ROOT as well.