From 1a4513a02ec68d67883a4d545c4d898fa06f4434 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 22 Jan 2025 01:46:55 +0100 Subject: [PATCH 1/4] qt6: add project Always has to be system-provided (Linux builds will come later). --- .gitlab/ci/configure_common.cmake | 1 + projects/qt6.cmake | 2 ++ projects/qt6.options.cmake | 19 +++++++++++++ projects/qt6.system.cmake | 44 +++++++++++++++++++++++++++++++ selftest/CMakeLists.txt | 1 + selftest/tests/CMakeLists.txt | 1 + 6 files changed, 68 insertions(+) create mode 100644 projects/qt6.cmake create mode 100644 projects/qt6.options.cmake create mode 100644 projects/qt6.system.cmake diff --git a/.gitlab/ci/configure_common.cmake b/.gitlab/ci/configure_common.cmake index be8a01130..7200099e3 100644 --- a/.gitlab/ci/configure_common.cmake +++ b/.gitlab/ci/configure_common.cmake @@ -154,6 +154,7 @@ enable_project(pytz) enable_project(pywin32) enable_project(qhull) enable_project(qt5) +enable_project(qt6) enable_project(rkcommon) enable_project(scipy) enable_project(seacas) diff --git a/projects/qt6.cmake b/projects/qt6.cmake new file mode 100644 index 000000000..5725b7456 --- /dev/null +++ b/projects/qt6.cmake @@ -0,0 +1,2 @@ +superbuild_add_project(qt6 + MUST_USE_SYSTEM) diff --git a/projects/qt6.options.cmake b/projects/qt6.options.cmake new file mode 100644 index 000000000..2360352e1 --- /dev/null +++ b/projects/qt6.options.cmake @@ -0,0 +1,19 @@ +# Add option to build qtsvg, on by default for svg icon support +option(qt6_ENABLE_SVG "Build Qt6 SVG library." ON) +mark_as_advanced(qt6_ENABLE_SVG) + +# Add option to build qtmultimedia, on by default +option(qt6_ENABLE_MULTIMEDIA "Build Qt6 Multimedia library." ON) +mark_as_advanced(qt6_ENABLE_MULTIMEDIA) + +# Add option to build qtwebchannel, off by default +option(qt6_ENABLE_WEBCHANNEL "Build Qt6 Webchannel library." OFF) +mark_as_advanced(qt6_ENABLE_WEBCHANNEL) + +# Add option to build qtwebengine, off by default +option(qt6_ENABLE_WEBENGINE "Build Qt6 Webengine library." OFF) +mark_as_advanced(qt6_ENABLE_WEBENGINE) + +# Add option to build qtwebsockets, off by default +option(qt6_ENABLE_WEBSOCKETS "Build Qt6 Websockets library." OFF) +mark_as_advanced(qt6_ENABLE_WEBSOCKETS) diff --git a/projects/qt6.system.cmake b/projects/qt6.system.cmake new file mode 100644 index 000000000..c53f7121b --- /dev/null +++ b/projects/qt6.system.cmake @@ -0,0 +1,44 @@ +include(qt6.options) + +if (qt6_ENABLE_SVG) + list(APPEND qt6_components Svg) +endif () + +if (qt5_ENABLE_MULTIMEDIA) + list(APPEND qt6_components Multimedia) +endif () + +if (qt6_ENABLE_WEBCHANNEL) + list(APPEND qt6_components WebChannel) +endif () + +if (qt6_ENABLE_WEBENGINE) + list(APPEND qt6_components WebEngine) +endif () + +if (qt6_ENABLE_WEBSOCKETS) + list(APPEND qt6_components WebSockets) +endif () + +find_package(Qt6 REQUIRED + COMPONENTS + Core + ${qt6_components}) + +superbuild_add_extra_cmake_args( + -DQt6_DIR:PATH=${Qt6_DIR} + -DQt6Core_DIR:PATH=${Qt6_DIR}/../Qt6Core) + +foreach (qt6_component IN LISTS qt6_components) + superbuild_add_extra_cmake_args( + -DQt6${qt6_component}_DIR:PATH=${Qt6_DIR}/../Qt6${qt6_component}) +endforeach () + +if (APPLE) + get_filename_component(qt6_rpath "${Qt6_DIR}/../.." REALPATH) +endif () + +if (WIN32) + # support python testing in the build tree + get_filename_component(qt6_dllpath "${Qt6_DIR}/../../../bin" REALPATH) +endif() diff --git a/selftest/CMakeLists.txt b/selftest/CMakeLists.txt index d318b73c8..42a71969b 100644 --- a/selftest/CMakeLists.txt +++ b/selftest/CMakeLists.txt @@ -108,6 +108,7 @@ function (superbuild_find_projects var) pytz qhull qt5 + qt6 rkcommon scipy seacas diff --git a/selftest/tests/CMakeLists.txt b/selftest/tests/CMakeLists.txt index dfe9c7f80..f6714479e 100644 --- a/selftest/tests/CMakeLists.txt +++ b/selftest/tests/CMakeLists.txt @@ -71,6 +71,7 @@ list(REMOVE_ITEM license_projects # USE_SYSTEM projects openmp + qt6 ) # Apple USE_SYSTEM projects -- GitLab From 803fb048db6adfff9b86a008aabc270b24173b05 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 30 Jan 2025 01:00:45 +0100 Subject: [PATCH 2/4] selftest: add a test for Qt6 targets --- selftest/tests/CMakeLists.txt | 16 +++++++ selftest/tests/qt6-check/CMakeLists.txt | 56 +++++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 selftest/tests/qt6-check/CMakeLists.txt diff --git a/selftest/tests/CMakeLists.txt b/selftest/tests/CMakeLists.txt index f6714479e..a61ec76d0 100644 --- a/selftest/tests/CMakeLists.txt +++ b/selftest/tests/CMakeLists.txt @@ -212,6 +212,22 @@ if (TARGET boost AND APPLE) -P "${CMAKE_CURRENT_SOURCE_DIR}/boost-check-rpath.cmake") endif () +if (TARGET qt6) + add_test( + NAME qt6-check + COMMAND + "${CMAKE_CTEST_COMMAND}" + --build-generator "${CMAKE_GENERATOR}" + --build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/qt6-check" "${CMAKE_CURRENT_BINARY_DIR}/qt6-check" + --build-options "-DCMAKE_PREFIX_PATH=${install_dir}" + -Dqt6_ENABLE_SVG=${qt6_ENABLE_SVG} + -Dqt6_ENABLE_MULTIMEDIA=${qt6_ENABLE_MULTIMEDIA} + -Dqt6_ENABLE_WEBCHANNEL=${qt6_ENABLE_WEBCHANNEL} + -Dqt6_ENABLE_WEBENGINE=${qt6_ENABLE_WEBENGINE} + -Dqt6_ENABLE_WEBSOCKETS=${qt6_ENABLE_WEBSOCKETS} + --test-command "${CMAKE_CTEST_COMMAND}" --output-on-failure) +endif () + add_python_import_test(python3 this) add_python_import_test(matplotlib matplotlib) add_python_script_test(matplotlib matplotlib-render) diff --git a/selftest/tests/qt6-check/CMakeLists.txt b/selftest/tests/qt6-check/CMakeLists.txt new file mode 100644 index 000000000..efa1d6bb7 --- /dev/null +++ b/selftest/tests/qt6-check/CMakeLists.txt @@ -0,0 +1,56 @@ +cmake_minimum_required(VERSION 3.14) +project(qt6-check CXX) + +message(CTEST_FULL_OUTPUT) + +function (check_target target) + if (NOT TARGET "${target}") + message(SEND_ERROR + "Target `${target}` not defined.") + endif () +endfunction () + +set(qt6_components + Core + Core5Compat + Help + LinguistTools + Network + PrintSupport + Test + Widgets) +if (qt6_ENABLE_SVG) + list(APPEND qt6_components + Svg) +endif () +if (qt6_ENABLE_MULTIMEDIA) + list(APPEND qt6_components + Multimedia) +endif () +if (qt6_ENABLE_WEBCHANNEL) + list(APPEND qt6_components + WebChannel) +endif () +if (qt6_ENABLE_WEBENGINE) + list(APPEND qt6_components + WebEngineWidgets) +endif () +if (qt6_ENABLE_WEBSOCKETS) + list(APPEND qt6_components + WebSockets) +endif () + +find_package(Qt6 + COMPONENTS ${qt6_components}) +if (NOT Qt6_FOUND) + message(FATAL_ERROR + "Failed to find Qt6: ${Qt6_NOT_FOUND_MESSAGE}") +endif () + +list(REMOVE_ITEM qt6_components + # Not a target component. + LinguistTools) + +foreach (qt6_component IN LISTS qt6_components) + check_target("Qt6::${qt6_component}") +endforeach () -- GitLab From a807c7db9a791957e03723a9762e1b5bd1973573 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 30 Jan 2025 01:43:30 +0100 Subject: [PATCH 3/4] ci: add script to download Qt6 --- .gitlab/ci/download_qt6.cmake | 132 +++++++++++++++++++++++++++ .gitlab/ci/download_qt6_hashes.cmake | 35 +++++++ 2 files changed, 167 insertions(+) create mode 100644 .gitlab/ci/download_qt6.cmake create mode 100644 .gitlab/ci/download_qt6_hashes.cmake diff --git a/.gitlab/ci/download_qt6.cmake b/.gitlab/ci/download_qt6.cmake new file mode 100644 index 000000000..5ad4a76d8 --- /dev/null +++ b/.gitlab/ci/download_qt6.cmake @@ -0,0 +1,132 @@ +cmake_minimum_required(VERSION 3.12) + +# Input variables. +set(qt_version_major "6") +set(qt_version_minor "9") +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") + +# Determine the ABI to fetch for Qt. +if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2022") + set(qt_platform "windows_x86") + set(msvc_year "2022") + set(qt_abi "win64_msvc${msvc_year}_64") +elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "macos") + set(qt_platform "mac_x64") + set(qt_abi "clang_64") +elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "linux") + set(qt_platform "linux_x64") + set(qt_abi "linux_gcc_64") +else () + message(FATAL_ERROR + "Unknown ABI to use for Qt") +endif () + +# 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}") + +# Directories for addons. +set(qt_addon_directory_for_qt5compat ".addons.qt5compat") +set(qt_addon_directory_for_qtmultimedia ".addons.qtmultimedia") +set(qt_addon_directory_for_qtwebchannel ".addons.qtwebchannel") +set(qt_addon_directory_for_qtwebsockets ".addons.qtwebsockets") +set(qt_addon_directory_for_qtwebview ".addons.qtwebview") + +# Files needed to download. +set(qt_files) +if (qt_platform STREQUAL "windows_x86") + set(qt_build_stamp "202501171337") + set(qt_file_name_prefix "${qt_version}-0-${qt_build_stamp}") + list(APPEND qt_files + "qt.qt6.${qt_version_nodot}.${qt_abi}/${qt_file_name_prefix}d3dcompiler_47-x64.7z" + "qt.qt6.${qt_version_nodot}.${qt_abi}/${qt_file_name_prefix}opengl32sw-64-mesa_11_2_2-signed_sha256.7z") + + foreach (qt_component IN ITEMS qtbase qtsvg qttools qtmultimedia qt5compat qtwebchannel qtwebsockets qtwebview qttranslations) + list(APPEND qt_files + "qt.qt6.${qt_version_nodot}${qt_addon_directory_for_${qt_component}}.${qt_abi}/${qt_file_name_prefix}${qt_component}-Windows-Windows_11_23H2-MSVC2022-Windows-Windows_11_23H2-X86_64.7z") + endforeach () + + set(qt_subdir "${qt_version}/clang_64") +elseif (qt_platform STREQUAL "mac_x64") + set(qt_build_stamp "202501171328") + set(qt_file_name_prefix "${qt_version}-0-${qt_build_stamp}") + + foreach (qt_component IN ITEMS qtbase qtsvg qttools qtmultimedia qt5compat qtwebchannel qtwebsockets qtwebview qttranslations) + list(APPEND qt_files + "qt.qt6.${qt_version_nodot}${qt_addon_directory_for_${qt_component}}.${qt_abi}/${qt_file_name_prefix}${qt_component}-MacOS-MacOS_14-Clang-MacOS-MacOS_14-X86_64-ARM64.7z") + endforeach () + + set(qt_subdir "${qt_version}/clang_64") +elseif (qt_platform STREQUAL "linux_x64") + set(qt_build_stamp "202501171339") + set(qt_file_name_prefix "${qt_version}-0-${qt_build_stamp}") + + foreach (qt_component IN ITEMS qtbase qtsvg qttools qtmultimedia qt5compat qtwebchannel qtwebsockets qtwebview qttranslations) + list(APPEND qt_files + "qt.qt6.${qt_version_nodot}${qt_addon_directory_for_${qt_component}}.${qt_abi}/${qt_file_name_prefix}${qt_component}-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z") + endforeach () + + set(qt_subdir "${qt_version}/clang_64") +else () + message(FATAL_ERROR + "Unknown files for ${qt_platform}") +endif () + +# Verify that we know what directory will be extracted. +if (NOT qt_subdir) + message(FATAL_ERROR + "The extracted subdirectory is not set") +endif () + +# Build up the path to the file to download. +set(qt_url_path "${qt_platform}/desktop/qt6_${qt_version_nodot}/qt6_${qt_version_nodot}") +set(qt_url_prefix "${qt_url_root}/${qt_url_path}") + +# Include the file containing the hashes of the files that matter. +include("${CMAKE_CURRENT_LIST_DIR}/download_qt6_hashes.cmake") + +file(MAKE_DIRECTORY ".gitlab/qt6") + +# Download and extract each file. +foreach (qt_file IN LISTS qt_files) + get_filename_component(qt_filename "${qt_file}" NAME) + + # Ensure we have a hash to verify. + if (NOT DEFINED "${qt_filename}_hash") + message(FATAL_ERROR + "Unknown hash for ${qt_file}") + endif () + + # Download the file. + file(DOWNLOAD + "${qt_url_prefix}/${qt_file}" + ".gitlab/${qt_filename}" + STATUS download_status + EXPECTED_HASH "SHA256=${${qt_filename}_hash}") + + # Check the download status. + list(GET download_status 0 res) + if (res) + list(GET download_status 1 err) + message(FATAL_ERROR + "Failed to download ${qt_file}: ${err}") + endif () + + # Extract the file. + execute_process( + COMMAND + "${CMAKE_COMMAND}" + -E tar + xf "../${qt_filename}" + WORKING_DIRECTORY ".gitlab/qt6" + RESULT_VARIABLE res + ERROR_VARIABLE err + ERROR_STRIP_TRAILING_WHITESPACE) + if (res) + message(FATAL_ERROR + "Failed to extract ${qt_file}: ${err}") + endif () +endforeach () diff --git a/.gitlab/ci/download_qt6_hashes.cmake b/.gitlab/ci/download_qt6_hashes.cmake new file mode 100644 index 000000000..2fb638a3c --- /dev/null +++ b/.gitlab/ci/download_qt6_hashes.cmake @@ -0,0 +1,35 @@ +# Lines can be generated by doing: +# +# sha256sum $files | awk '{ print "set(\"" $2 "_hash\" " $1 ")" }' >> $thisfile + +set("6.9.0-0-202501171339qt5compat-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z_hash" ffb029801004f9d6b957ee85702c27d4db1d989372d57c7670c07fdfa696bdac) +set("6.9.0-0-202501171339qtbase-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z_hash" 68f1d5c5dd21a6b517b6ee58edd964d9367a911ea403827572ea3847c5c0a97d) +set("6.9.0-0-202501171339qtmultimedia-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z_hash" 95fd11ea28bdd6f12e5a5998c05015e8d8504cd6ad14be10e111733d80a52b3b) +set("6.9.0-0-202501171339qtsvg-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z_hash" bbd6e5515ee0a57930684247e8325fe45653709fa79743e83e9b4c5a92544626) +set("6.9.0-0-202501171339qttools-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z_hash" 70fcb849ee14c0e1ed6dd6367c8029db26ca4de687ba24d3c82f3fb4379042f4) +set("6.9.0-0-202501171339qttranslations-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z_hash" 171dc08c37414e27a0b336be5b23192b884b446ac5e691e29c62061f6fae0dad) +set("6.9.0-0-202501171339qtwebchannel-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z_hash" d5b98eac5a48b4650ebc2e2caf5f8d3de3fed37b7282fa004276c6125ce915df) +set("6.9.0-0-202501171339qtwebsockets-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z_hash" 81ade0697d61ef0e2d9ef59286f0e4527f5906385fadd16510680290d718f93f) +set("6.9.0-0-202501171339qtwebview-Linux-RHEL_8_10-GCC-Linux-RHEL_8_10-X86_64.7z_hash" ea8dd15294dad97a24017de930197742cd5bfd69c71b6b12595d98508f1afd00) + +set("6.9.0-0-202501171328qt5compat-MacOS-MacOS_14-Clang-MacOS-MacOS_14-X86_64-ARM64.7z_hash" 793bce3996d11750e0d6850db2083eee4c6bc52d4cda5d6b69c0c3e3450dc1be) +set("6.9.0-0-202501171328qtbase-MacOS-MacOS_14-Clang-MacOS-MacOS_14-X86_64-ARM64.7z_hash" f4bfe9fefd95fe7a254b6ac545d8b675a71a30dc7dc58ed564b671cf5bf28a66) +set("6.9.0-0-202501171328qtmultimedia-MacOS-MacOS_14-Clang-MacOS-MacOS_14-X86_64-ARM64.7z_hash" 654af86679a9fc84957f3f1ec704163b563046c64ca9c92f04c7ac7d59f94a0b) +set("6.9.0-0-202501171328qtsvg-MacOS-MacOS_14-Clang-MacOS-MacOS_14-X86_64-ARM64.7z_hash" baba5e80afd09b44da360d002db66b31853a60e2ea30f536e77702b71965e9f3) +set("6.9.0-0-202501171328qttools-MacOS-MacOS_14-Clang-MacOS-MacOS_14-X86_64-ARM64.7z_hash" 2f0209b8110bdf740a02ce988eec0cac1e5519933491f8e46851759f1f7a382d) +set("6.9.0-0-202501171328qttranslations-MacOS-MacOS_14-Clang-MacOS-MacOS_14-X86_64-ARM64.7z_hash" 65805a81a94b4094e4b9c907e63a967cfb83176068c5dcef434c94701a0b3137) +set("6.9.0-0-202501171328qtwebchannel-MacOS-MacOS_14-Clang-MacOS-MacOS_14-X86_64-ARM64.7z_hash" 394094c8c6a337c38e7db2d1b77b40656033a2223dc561252d9c208d4da93c1d) +set("6.9.0-0-202501171328qtwebsockets-MacOS-MacOS_14-Clang-MacOS-MacOS_14-X86_64-ARM64.7z_hash" 5476091b5aa3efdb445cac816ff8f34fde573b713f25b2fd0b43657aaebdbffa) +set("6.9.0-0-202501171328qtwebview-MacOS-MacOS_14-Clang-MacOS-MacOS_14-X86_64-ARM64.7z_hash" de1ce8bcf73e6d714eedb23c3e8c86086f7f0192904f8dd4545494ead35475c9) + +set("6.9.0-0-202501171337d3dcompiler_47-x64.7z_hash" 32954e17c688ba9f764c900ddf0f06ad0e5323073702fb74f0b12680a967c571) +set("6.9.0-0-202501171337opengl32sw-64-mesa_11_2_2-signed_sha256.7z_hash" 5427f1b3a25caa59922749e6e8f16e05de6d050efd48301844d6ea80d2c16e7b) +set("6.9.0-0-202501171337qt5compat-Windows-Windows_11_23H2-MSVC2022-Windows-Windows_11_23H2-X86_64.7z_hash" b5753c219adc575b4597bd47946c540bbe6a0875a40131d9c38517cf39fe10e7) +set("6.9.0-0-202501171337qtbase-Windows-Windows_11_23H2-MSVC2022-Windows-Windows_11_23H2-X86_64.7z_hash" 2f1d60fdc9fb822b533653ba0bec873dfe387971833e84d8ee67c19be952062d) +set("6.9.0-0-202501171337qtmultimedia-Windows-Windows_11_23H2-MSVC2022-Windows-Windows_11_23H2-X86_64.7z_hash" 17d57a74ccf89751ddd80a2d843a6c0abab75ae140f3401728b0e1327be6ba21) +set("6.9.0-0-202501171337qtsvg-Windows-Windows_11_23H2-MSVC2022-Windows-Windows_11_23H2-X86_64.7z_hash" 3495f0a4b36defa5ab3d77d2c71dfabf930f631067dfe49376b1049709f094bc) +set("6.9.0-0-202501171337qttools-Windows-Windows_11_23H2-MSVC2022-Windows-Windows_11_23H2-X86_64.7z_hash" bac2e82435e4f5cd15ae60a8b5c00958cf59272a766bb822fca2acfed6ed36e3) +set("6.9.0-0-202501171337qttranslations-Windows-Windows_11_23H2-MSVC2022-Windows-Windows_11_23H2-X86_64.7z_hash" b9508d1a681cf1c38d575fd810318bae5071bcdb69470e27ebdd8ba92010d5ca) +set("6.9.0-0-202501171337qtwebchannel-Windows-Windows_11_23H2-MSVC2022-Windows-Windows_11_23H2-X86_64.7z_hash" 8e4c5d52b1f370a20f14a984e0a03472e54001987b0675270a80eb271081b4d9) +set("6.9.0-0-202501171337qtwebsockets-Windows-Windows_11_23H2-MSVC2022-Windows-Windows_11_23H2-X86_64.7z_hash" dec2b888b5c91889f761e3d318a3d7c9e9f06e2a65b38a1a8b93eb54da22bb04) +set("6.9.0-0-202501171337qtwebview-Windows-Windows_11_23H2-MSVC2022-Windows-Windows_11_23H2-X86_64.7z_hash" 1030893b9d399c79fcf2eb769891be59a5d0ce462221d479fe573525f1157b54) -- GitLab From 28bf032c5dd2d8aa87b591f96e9b22b40448aba2 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 30 Jan 2025 23:45:59 +0100 Subject: [PATCH 4/4] gitlab-ci: download Qt6 --- .gitlab/os-linux.yml | 3 +++ .gitlab/os-macos.yml | 3 ++- .gitlab/os-windows.yml | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 38279bd33..52f132360 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -65,6 +65,9 @@ - export PATH=$PWD/.gitlab:$PWD/.gitlab/cmake/bin:$PATH - cmake --version - ninja --version + # Download Qt + - cmake -P .gitlab/ci/download_qt6.cmake + - export CMAKE_PREFIX_PATH=$PWD/.gitlab/qt6 .before_script_linux_venv: &before_script_linux_venv # Build a venv with a new `pip` and required packages. diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 51f1ea256..020e47682 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -75,7 +75,8 @@ - gfortran --version # Download Qt - cmake -P .gitlab/ci/download_qt.cmake - - export CMAKE_PREFIX_PATH=$PWD/.gitlab/qt + - cmake -P .gitlab/ci/download_qt6.cmake + - export CMAKE_PREFIX_PATH=$PWD/.gitlab/qt:$PWD/.gitlab/qt6 .cmake_build_macos: stage: build diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 71054473b..54415671a 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -65,7 +65,8 @@ .before_script_windows_deps: &before_script_windows_deps - cmake -P .gitlab/ci/download_qt.cmake - - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\qt\bin;$env:PATH" + - cmake -P .gitlab/ci/download_qt6.cmake + - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\qt\bin;$pwdpath\.gitlab\qt6\bin;$env:PATH" # Add the outputs to the PATH - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\build\install\Python;$env:PATH;$pwdpath\build\install\bin" - Set-Item -Force -Path "env:PYTHONHOME" -Value "$pwdpath\build\install\Python" -- GitLab