diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-26 17:00:52 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-26 21:57:20 +0200 |
| commit | 68134db435b670abb9f785f54e58593e90e1f484 (patch) | |
| tree | c7fe9f9a3add07d891ccd2c007aa515fe6866cab | |
| parent | 0685312d2e7d0bbe5bd7d9847aba4366822ce97d (diff) | |
Update provisioned CMake version to 3.17.2
This should fix the ninja deps issue we had on Windows with the
Ninja Multi-Config generator, where calling ninja a second time to
rebuild the project failed.
More details at https://gitlab.kitware.com/cmake/cmake/-/issues/20723
Change-Id: I0029e57fbc704120d2241499a87cad0ad40c2e50
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rwxr-xr-x | coin/provisioning/common/linux/cmake_linux.sh | 4 | ||||
| -rwxr-xr-x | coin/provisioning/common/macos/cmake.sh | 4 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/cmake.ps1 | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index e2bb13aa..ea2cdf8e 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -43,10 +43,10 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" majorminorversion="3.17" -version="3.17.0-rc2" +version="3.17.2" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz" AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz" -SHA1="5b64ed00a48db524e981b82e3a3a8a14d52091c2" +SHA1="24a68e61292b91c706b09b4aa8044764e2dfb2e2" targetFolder="/opt/cmake-$version" appPrefix="cmake-$version-Linux-x86_64" diff --git a/coin/provisioning/common/macos/cmake.sh b/coin/provisioning/common/macos/cmake.sh index 49943e7d..80b513d6 100755 --- a/coin/provisioning/common/macos/cmake.sh +++ b/coin/provisioning/common/macos/cmake.sh @@ -43,10 +43,10 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" majorminorversion="3.17" -version="3.17.0-rc2" +version="3.17.2" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Darwin-x86_64.tar.gz" AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Darwin-x86_64.tar.gz" -SHA1="af50a64bcfbb8dfefae355624b254e3c547dcd3d" +SHA1="918a21481751b19915767649281d623aa60716f4" appPrefix="cmake-$version-Darwin-x86_64" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index 4246fa02..5d61549a 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -34,7 +34,7 @@ . "$PSScriptRoot\helpers.ps1" $majorminorversion = "3.17" -$version = "3.17.0-rc2" +$version = "3.17.2" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "db10f03227b978a51c76453283f3280fc63c157d" +Verify-Checksum $zip "d4a1d60fccaee7f9a8ceb1ed4fb576a63103a69f" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" |