diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2020-09-24 13:16:05 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-25 08:58:20 +0200 |
| commit | 74f29a622a9a70e6b2187275658ccda9569d1fc9 (patch) | |
| tree | cb57fb25ce503f0356c34476542fe4ab8aad125f /coin/provisioning/common/linux/cmake_linux.sh | |
| parent | 2076163c5e6978df28257f590730fbcc83a8ad2a (diff) | |
CMake: Update provisioned CMake to version 3.18.3
This version should fix the iOS PCH builds and Ninja Multi-Config,
as well as the issues with AUTOMOC and Ninja.
Temporarily explicitly disable the pkg_config feature on Windows
hosts, because otherwise the configuration will break. The
FindPkgConfig module in 3.18 has some additional behavior for checking
if the found pkg-config works, and that's not handled by our
qt_build_internals_disable_pkg_config_if_needed function in qtbase.
Fixes: QTBUG-86862
Change-Id: I80514d3d7896ae09ab252aed10e86725fae0cc9c
Reviewed-by: Toni Saario <toni.saario@qt.io>
Diffstat (limited to 'coin/provisioning/common/linux/cmake_linux.sh')
| -rwxr-xr-x | coin/provisioning/common/linux/cmake_linux.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 11168a5d..7f01c8f5 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -majorminorversion="3.17" -version="3.17.4" +majorminorversion="3.18" +version="3.18.3" 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="02329fd9091013ac6379b02ceb64df39659437de" +SHA1="6e5bb13e07616e8fa28ec22e8e8dd2396510f10c" targetFolder="/opt/cmake-$version" appPrefix="cmake-$version-Linux-x86_64" |