diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2020-10-27 13:49:07 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2020-10-27 13:49:07 (GMT) |
| commit | e68d3e3b445bd735cc16ef308de1ef35fa98d784 (patch) | |
| tree | ec4f0971d6a4996ee5bce7793293458507c49f62 /.gitlab/ci | |
| parent | d759c4310d9cdb4c9c4004fed5f914b6d1a75b5c (diff) | |
| download | CMake-e68d3e3b445bd735cc16ef308de1ef35fa98d784.zip CMake-e68d3e3b445bd735cc16ef308de1ef35fa98d784.tar.gz CMake-e68d3e3b445bd735cc16ef308de1ef35fa98d784.tar.bz2 | |
ci: update to Qt 5.15.1
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/download_qt.cmake | 15 | ||||
| -rw-r--r-- | .gitlab/ci/download_qt_hashes.cmake | 10 |
2 files changed, 9 insertions, 16 deletions
diff --git a/.gitlab/ci/download_qt.cmake b/.gitlab/ci/download_qt.cmake index 31ce6c3..c7e3717 100644 --- a/.gitlab/ci/download_qt.cmake +++ b/.gitlab/ci/download_qt.cmake @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.12) # Input variables. set(qt_version_major "5") set(qt_version_minor "15") -set(qt_version_patch "0") +set(qt_version_patch "1") # This URL is only visible inside of Kitware's network. Please use your own Qt # Account to obtain these files. if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "package") @@ -20,7 +20,7 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2015") elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2017" OR "$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2019") set(qt_platform "windows_x86") - set(msvc_year "2017") + set(msvc_year "2019") set(qt_abi "win64_msvc${msvc_year}_64") elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "macos") set(qt_platform "mac_x64") @@ -37,14 +37,7 @@ set(qt_version_nodot "${qt_version_major}${qt_version_minor}${qt_version_patch}" # Files needed to download. set(qt_files) if (qt_platform STREQUAL "windows_x86") - if (msvc_year STREQUAL "2017") - set(qt_build_stamp "202002260536") - elseif (msvc_year STREQUAL "2015") - set(qt_build_stamp "202005150700") - else () - message(FATAL_ERROR - "Build stamp for MSVC ${msvc_year} is unknown") - endif () + set(qt_build_stamp "202009071110") set(qt_file_name_prefix "${qt_version}-0-${qt_build_stamp}") @@ -60,7 +53,7 @@ elseif (qt_platform STREQUAL "mac_x64") "qt-5.6.2-macosx10.7-x86_64.tar.xz") set(qt_subdir "qt-5.6.2-macosx10.7-x86_64") else () - set(qt_build_stamp "202005140805") + set(qt_build_stamp "202009071110") set(qt_file_name_prefix "${qt_version}-0-${qt_build_stamp}") foreach (qt_component IN ITEMS qtbase) diff --git a/.gitlab/ci/download_qt_hashes.cmake b/.gitlab/ci/download_qt_hashes.cmake index 28837dc..02a6fdd 100644 --- a/.gitlab/ci/download_qt_hashes.cmake +++ b/.gitlab/ci/download_qt_hashes.cmake @@ -2,12 +2,12 @@ # # sha256sum $files | awk '{ print "set(\"" $2 "_hash\" " $1 ")" }' >> $thisfile -set("5.15.0-0-202002260536qtbase-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64.7z_hash" c041596be8f7a16c7be9ea6757c14766ff3200ab6d56f7db8f865dbfe039fe20) -set("5.15.0-0-202002260536qtwinextras-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64.7z_hash" 10796128fac54f146767e33f6872975ba238858547de7a9650ec4cd9581fe71a) +set("5.15.1-0-202009071110qtbase-Windows-Windows_10-MSVC2019-Windows-Windows_10-X86_64.7z_hash" a5635124a135f383d9fb92bf628b018cff9f781addfd388926a367cda5b7cd38) +set("5.15.1-0-202009071110qtwinextras-Windows-Windows_10-MSVC2019-Windows-Windows_10-X86_64.7z_hash" 908947855b5d7a854886746365ac29e9296b5d64d4e18089641a6988167807d3) -set("5.15.0-0-202005150700qtbase-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86_64.7z_hash" 0c2653c5eca256f59c0b48b537cd633b05560e4241c0226856d2ae22ab066df4) -set("5.15.0-0-202005150700qtwinextras-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86_64.7z_hash" 4bca3a8d8c7611e211a82d86b3396f8a622abe7859d5052452414642ec191844) +set("5.15.1-0-202009071110qtbase-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86_64.7z_hash" 5d0d2e71e3b00cf88ac4c616b4b314a7e73871f325512821f53c464cdfee961f) +set("5.15.1-0-202009071110qtwinextras-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86_64.7z_hash" 803e0234169464babb5305dedc21382e90c3266c6f9414ff0cff04be578681e1) -set("5.15.0-0-202005140805qtbase-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z_hash" 04d867c81d2431f288c42c9752642759460b9468477de349368dcc8de0c8ddc4) +set("5.15.1-0-202009071110qtbase-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z_hash" df2813ce7c6cb4287abd7956cd1cb9d08312e4ac1208b6cb57af4df11b8ebba1) set("qt-5.6.2-macosx10.7-x86_64.tar.xz_hash" 2b60373ea60037ce356d4c9f5a8c1df9854127a2c55118252e1a2f5a5f4e0010) |