diff options
| author | Brad King <brad.king@kitware.com> | 2022-06-13 16:53:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-06-13 19:02:51 (GMT) |
| commit | add3dc95087d1119bc5cbbebf4610e2c40700cca (patch) | |
| tree | 0a00331934d9cb0cca93b05722670f2663ac6c96 | |
| parent | d0c9225a7e7aa6c6c85eb9fc97dcaf34b1b6a33a (diff) | |
| download | CMake-add3dc95087d1119bc5cbbebf4610e2c40700cca.zip CMake-add3dc95087d1119bc5cbbebf4610e2c40700cca.tar.gz CMake-add3dc95087d1119bc5cbbebf4610e2c40700cca.tar.bz2 | |
ci: Re-order logic for downloading Qt during packaging
Prepare to support per-architecture URLs.
| -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 90c2187..3dba090 100644 --- a/.gitlab/ci/download_qt.cmake +++ b/.gitlab/ci/download_qt.cmake @@ -12,6 +12,8 @@ set(qt_version_nodot "${qt_version_major}${qt_version_minor}${qt_version_patch}" # Files needed to download. set(qt_files) if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "windows.*package") + set(qt_url_root "https://cmake.org/files/dependencies") + set(qt_url_path "") if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "windows_x86_64_package") list(APPEND qt_files "qt-5.12.1-win-x86_64-msvc_v142-1.zip") set(qt_subdir "qt-5.12.1-win-x86_64-msvc_v142-1") @@ -21,8 +23,6 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "windows.*package") else () message(FATAL_ERROR "Unknown arch to use for Qt") endif() - set(qt_url_root "https://cmake.org/files/dependencies") - set(qt_url_path "") elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "windows") # Determine the ABI to fetch for Qt. if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2015") |