diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2020-09-16 15:41:12 -0400 |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2020-09-16 16:09:01 -0400 |
| commit | 5138be9558ad04279a37695280cd195d07d9a40d (patch) | |
| tree | 64bb5e919506adeb9a392edcfae9b155fa3421a2 /.gitlab | |
| parent | 8ff3ce730d7a7c89c719caeac4ba7970f35565df (diff) | |
| download | cmake-5138be9558ad04279a37695280cd195d07d9a40d.tar.gz | |
ci: use a pre-built Qt for macOS packages
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/download_qt.cmake | 32 | ||||
| -rw-r--r-- | .gitlab/ci/download_qt_hashes.cmake | 2 |
2 files changed, 25 insertions, 9 deletions
diff --git a/.gitlab/ci/download_qt.cmake b/.gitlab/ci/download_qt.cmake index c392b1c4a2..31ce6c30db 100644 --- a/.gitlab/ci/download_qt.cmake +++ b/.gitlab/ci/download_qt.cmake @@ -6,7 +6,11 @@ set(qt_version_minor "15") set(qt_version_patch "0") # This URL is only visible inside of Kitware's network. Please use your own Qt # Account to obtain these files. -set(qt_url_root "https://paraview.org/files/dependencies/internal/qt") +if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "package") + set(qt_url_root "https://cmake.org/files/dependencies") +else () + set(qt_url_root "https://paraview.org/files/dependencies/internal/qt") +endif () # Determine the ABI to fetch for Qt. if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2015") @@ -51,15 +55,21 @@ if (qt_platform STREQUAL "windows_x86") set(qt_subdir "${qt_version}/msvc${msvc_year}_64") elseif (qt_platform STREQUAL "mac_x64") - set(qt_build_stamp "202005140805") - set(qt_file_name_prefix "${qt_version}-0-${qt_build_stamp}") - - foreach (qt_component IN ITEMS qtbase) + if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "package") list(APPEND qt_files - "${qt_file_name_prefix}${qt_component}-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z") - endforeach () + "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_file_name_prefix "${qt_version}-0-${qt_build_stamp}") + + foreach (qt_component IN ITEMS qtbase) + list(APPEND qt_files + "${qt_file_name_prefix}${qt_component}-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z") + endforeach () - set(qt_subdir "${qt_version}/clang_64") + set(qt_subdir "${qt_version}/clang_64") + endif () else () message(FATAL_ERROR "Unknown files for ${qt_platform}") @@ -72,7 +82,11 @@ if (NOT qt_subdir) endif () # Build up the path to the file to download. -set(qt_url_path "${qt_platform}/desktop/qt5_${qt_version_nodot}/qt.qt5.${qt_version_nodot}.${qt_abi}") +if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "package") + set(qt_url_path "") +else () + set(qt_url_path "${qt_platform}/desktop/qt5_${qt_version_nodot}/qt.qt5.${qt_version_nodot}.${qt_abi}") +endif () set(qt_url_prefix "${qt_url_root}/${qt_url_path}") # Include the file containing the hashes of the files that matter. diff --git a/.gitlab/ci/download_qt_hashes.cmake b/.gitlab/ci/download_qt_hashes.cmake index 59cb597779..28837dc57f 100644 --- a/.gitlab/ci/download_qt_hashes.cmake +++ b/.gitlab/ci/download_qt_hashes.cmake @@ -9,3 +9,5 @@ set("5.15.0-0-202005150700qtbase-Windows-Windows_10-MSVC2015-Windows-Windows_10- set("5.15.0-0-202005150700qtwinextras-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86_64.7z_hash" 4bca3a8d8c7611e211a82d86b3396f8a622abe7859d5052452414642ec191844) set("5.15.0-0-202005140805qtbase-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z_hash" 04d867c81d2431f288c42c9752642759460b9468477de349368dcc8de0c8ddc4) + +set("qt-5.6.2-macosx10.7-x86_64.tar.xz_hash" 2b60373ea60037ce356d4c9f5a8c1df9854127a2c55118252e1a2f5a5f4e0010) |