diff --git a/.gitlab/.gitignore b/.gitlab/.gitignore index a4a3ddde23..91e677b937 100644 --- a/.gitlab/.gitignore +++ b/.gitlab/.gitignore @@ -1,5 +1,5 @@ # Ignore files known to be downloaded by CI jobs. -/5.15.1-0-202009071110* +/6.9.3-0-202509261208* /6.9.3-0-202509261207* /appimagetool /bcc* diff --git a/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake b/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake deleted file mode 100644 index c078f9049e..0000000000 --- a/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_vs_common_ninja.cmake") diff --git a/.gitlab/ci/download_qt.cmake b/.gitlab/ci/download_qt.cmake index 418a1899df..759365e170 100644 --- a/.gitlab/ci/download_qt.cmake +++ b/.gitlab/ci/download_qt.cmake @@ -1,14 +1,5 @@ cmake_minimum_required(VERSION 3.29) -# Input variables. -set(qt_version_major "5") -set(qt_version_minor "15") -set(qt_version_patch "1") - -# Combined version variables. -set(qt_version "${qt_version_major}.${qt_version_minor}.${qt_version_patch}") -set(qt_version_nodot "${qt_version_major}${qt_version_minor}${qt_version_patch}") - set(qt_tar_workdir ".gitlab") # Files needed to download. @@ -31,37 +22,13 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "windows.*package") message(FATAL_ERROR "Unknown arch to use for Qt") endif() elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "windows") - # Determine the ABI to fetch for Qt. - if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2015") - set(qt_platform "windows_x86") - set(msvc_year "2015") - set(qt_abi "win64_msvc${msvc_year}_64") - elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2017" OR - "$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2019" OR - "$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2022" OR - "$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2026") - set(qt_platform "windows_x86") - set(msvc_year "2019") - set(qt_abi "win64_msvc${msvc_year}_64") - else () - message(FATAL_ERROR "Unknown ABI to use for Qt") - endif () - - set(qt_build_stamp "202009071110") - - set(qt_file_name_prefix "${qt_version}-0-${qt_build_stamp}") - - foreach (qt_component IN ITEMS qtbase qtwinextras) - list(APPEND qt_files - "${qt_file_name_prefix}${qt_component}-Windows-Windows_10-MSVC${msvc_year}-Windows-Windows_10-X86_64.7z") - endforeach () - - set(qt_subdir "${qt_version}/msvc${msvc_year}_64") - # 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") - set(qt_url_path "${qt_platform}/desktop/qt5_${qt_version_nodot}/qt.qt5.${qt_version_nodot}.${qt_abi}") + set(qt_url_path "windows_x86/desktop/qt6_693/qt6_693/qt.qt6.693.win64_msvc2022_64") + list(APPEND qt_files "6.9.3-0-202509261208qtbase-Windows-Windows_11_23H2-MSVC2022-Windows-Windows_11_23H2-X86_64.7z") + set(qt_subdir "qt-extract") + set(qt_tar_workdir ".gitlab/${qt_subdir}") elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "macos") if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "macos10.10_package") set(qt_url_root "https://cmake.org/files/dependencies/qt") @@ -134,29 +101,6 @@ foreach (qt_file IN LISTS qt_files) file(REMOVE "${qt_file}") endforeach () -# The Windows tarballs have some unfortunate permissions in them that prevent -# deletion when `git clean -ffdx` tries to clean up the directory. -if (qt_platform STREQUAL "windows_x86") - # Fix permissions. - file(TO_NATIVE_PATH ".gitlab/${qt_subdir}/*.*" native_qt_dir) - execute_process( - # Remove any read-only flags that aren't affected by `icacls`. - COMMAND - attrib - -r # Remove readonly flag - "${native_qt_dir}" - /d # Treat as a directory - /s # Recursive - /l # Don't dereference symlinks - RESULT_VARIABLE res - ERROR_VARIABLE err - ERROR_STRIP_TRAILING_WHITESPACE) - if (res) - message(FATAL_ERROR - "Failed to fix remove read-only flags in ${qt_file}: ${err}") - endif () -endif () - # Move to a predictable prefix. file(RENAME ".gitlab/${qt_subdir}" diff --git a/.gitlab/ci/download_qt_hashes.cmake b/.gitlab/ci/download_qt_hashes.cmake index 6275954155..ea3220a3c2 100644 --- a/.gitlab/ci/download_qt_hashes.cmake +++ b/.gitlab/ci/download_qt_hashes.cmake @@ -2,17 +2,11 @@ # # sha256sum $files | awk '{ print "set(\"" $2 "_hash\" " $1 ")" }' >> $thisfile -set("5.15.1-0-202009071110qtbase-Windows-Windows_10-MSVC2019-Windows-Windows_10-X86_64.7z_hash" a5635124a135f383d9fb92bf628b018cff9f781addfd388926a367cda5b7cd38) -set("5.15.1-0-202009071110qtwinextras-Windows-Windows_10-MSVC2019-Windows-Windows_10-X86_64.7z_hash" 908947855b5d7a854886746365ac29e9296b5d64d4e18089641a6988167807d3) - -set("5.15.1-0-202009071110qtbase-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86_64.7z_hash" 5d0d2e71e3b00cf88ac4c616b4b314a7e73871f325512821f53c464cdfee961f) -set("5.15.1-0-202009071110qtwinextras-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86_64.7z_hash" 803e0234169464babb5305dedc21382e90c3266c6f9414ff0cff04be578681e1) - -set("5.15.1-0-202009071110qtbase-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z_hash" df2813ce7c6cb4287abd7956cd1cb9d08312e4ac1208b6cb57af4df11b8ebba1) - set("qt-5.9.9-macosx10.10-x86_64-arm64.tar.xz_hash" d4449771afa0bc6a809c14f1e6d939e7732494cf059503ae451e2bfe8fc60cc1) set("6.9.3-0-202509261207qtbase-MacOS-MacOS_15-Clang-MacOS-MacOS_15-X86_64-ARM64.7z_hash" 805144e619b7c7b0e9c985d929e1f290241d88b884218db3ad7d56bd579d6b4a) +set("6.9.3-0-202509261208qtbase-Windows-Windows_11_23H2-MSVC2022-Windows-Windows_11_23H2-X86_64.7z_hash" 94f8a097d3078661943446c9ecfee3fb4375d9b992a91a1a2d1856379c749d8d) + set("qt-6.10.1-win-arm64-msvc_v145-1.zip_hash" 59e150883f31c0e31a2890f06b6e434ad44505dba876fda4a7c0994c9b0bdfe1) set("qt-6.10.1-win-i386-msvc_v145-1.zip_hash" 09100628aecb7cdde07040d7437c09830ed8c17720960b10339b114cb4bbf18b) set("qt-6.10.1-win-x86_64-msvc_v145-1.zip_hash" 931f2354c715b30bc0ac35028f9d778aa552aa8a66580fc73c6a32384c5fa042) diff --git a/Tests/CMakeGUI/CMakeLists.txt b/Tests/CMakeGUI/CMakeLists.txt index d4c9bf89b7..6e2bcf5b45 100644 --- a/Tests/CMakeGUI/CMakeLists.txt +++ b/Tests/CMakeGUI/CMakeLists.txt @@ -2,7 +2,12 @@ include(CMakeParseArguments) get_property(CMake_QT_MAJOR_VERSION TARGET cmake-gui PROPERTY CMake_QT_MAJOR_VERSION) -find_package(Qt${CMake_QT_MAJOR_VERSION}Test REQUIRED) +find_package(Qt${CMake_QT_MAJOR_VERSION} REQUIRED COMPONENTS + Core + Gui + Test + Widgets +) if(MSVC) # QTBUG-118993: Qt uses deprecated stdext::checked_array_iterator