diff options
author | Brad King <brad.king@kitware.com> | 2020-12-10 17:05:11 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-12-10 17:05:17 (GMT) |
commit | fd6c1e5a737f47d0dfd28d3b77e4b8e6dc8ff5d6 (patch) | |
tree | 1c0b4c547bd0ab3faeb2e9e709a9115fcacc1be8 /.gitlab/ci/download_qt.cmake | |
parent | 9109475bfb9371e74c6ddbf64a66054e5aaea795 (diff) | |
parent | 56a075eb5df3fc6a1bc400e1c1322985dc1ca3c9 (diff) | |
download | CMake-fd6c1e5a737f47d0dfd28d3b77e4b8e6dc8ff5d6.zip CMake-fd6c1e5a737f47d0dfd28d3b77e4b8e6dc8ff5d6.tar.gz CMake-fd6c1e5a737f47d0dfd28d3b77e4b8e6dc8ff5d6.tar.bz2 |
Merge topic 'rel-macos-apple-silicon'
56a075eb5d ci: update macOS package to produce universal binaries
b184cc256b ci: do not use sccache for macOS packaging
41bddf1028 ci: update to pre-built Qt 5.9.9 universal binaries for macOS packages
b201dc0d42 Utilities/Release: Add script to build Qt 5.9.9 macOS universal binaries
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5595
Diffstat (limited to '.gitlab/ci/download_qt.cmake')
-rw-r--r-- | .gitlab/ci/download_qt.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/ci/download_qt.cmake b/.gitlab/ci/download_qt.cmake index c7e3717..4a33f12 100644 --- a/.gitlab/ci/download_qt.cmake +++ b/.gitlab/ci/download_qt.cmake @@ -50,8 +50,8 @@ if (qt_platform STREQUAL "windows_x86") elseif (qt_platform STREQUAL "mac_x64") if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "package") list(APPEND qt_files - "qt-5.6.2-macosx10.7-x86_64.tar.xz") - set(qt_subdir "qt-5.6.2-macosx10.7-x86_64") + "qt-5.9.9-macosx10.10-x86_64-arm64.tar.xz") + set(qt_subdir "qt-5.9.9-macosx10.10-x86_64-arm64") else () set(qt_build_stamp "202009071110") set(qt_file_name_prefix "${qt_version}-0-${qt_build_stamp}") |