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/download_qt.cmake | |
| 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/download_qt.cmake')
| -rw-r--r-- | .gitlab/ci/download_qt.cmake | 15 |
1 files changed, 4 insertions, 11 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) |