From add3dc95087d1119bc5cbbebf4610e2c40700cca Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 13 Jun 2022 12:53:40 -0400 Subject: ci: Re-order logic for downloading Qt during packaging Prepare to support per-architecture URLs. --- .gitlab/ci/download_qt.cmake | 4 ++-- 1 file 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") -- cgit v0.12