diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 72f4def5671d031b68aa897fbf0ce183792acd0c..7e119078ade411ef69597d1748801faecc54883e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,7 +51,7 @@ stages: linux-shared:build: extends: - - .centos7_shared + - .centos8_shared - .cmake_build_linux - .cmake_build_artifacts - .linux_builder_tags @@ -81,7 +81,7 @@ linux-shared:upload: linux-static:build: extends: - - .centos7_static + - .centos8_static - .cmake_build_linux - .cmake_build_artifacts - .linux_builder_tags @@ -160,60 +160,60 @@ macos-x86_64:upload: ## MPI build -windows-vs2019-mpi:build: +windows-vs2022-mpi:build: extends: - - .windows_vs2019_mpi + - .windows_vs2022_mpi - .cmake_build_windows - .cmake_build_artifacts - .windows_builder_tags - .run_manually timeout: 150 minutes -windows-vs2019-mpi:test: +windows-vs2022-mpi:test: extends: - - .windows_vs2019_mpi + - .windows_vs2022_mpi - .cmake_test_windows - .cmake_package_artifacts - .windows_test_tags - .run_automatically needs: - - windows-vs2019-mpi:build + - windows-vs2022-mpi:build -windows-vs2019-mpi:upload: +windows-vs2022-mpi:upload: extends: - .rsync_upload - .upload_only needs: - - windows-vs2019-mpi:test + - windows-vs2022-mpi:test variables: RSYNC_DESTINATION: paraview_nightly_bin ## non-MPI build -windows-vs2019-nompi:build: +windows-vs2022-nompi:build: extends: - - .windows_vs2019_nompi + - .windows_vs2022_nompi - .cmake_build_windows - .cmake_build_artifacts - .windows_builder_tags - .run_manually timeout: 150 minutes -windows-vs2019-nompi:test: +windows-vs2022-nompi:test: extends: - - .windows_vs2019_nompi + - .windows_vs2022_nompi - .cmake_test_windows - .cmake_package_artifacts - .windows_test_tags - .run_automatically needs: - - windows-vs2019-nompi:build + - windows-vs2022-nompi:build -windows-vs2019-nompi:upload: +windows-vs2022-nompi:upload: extends: - .rsync_upload - .upload_only needs: - - windows-vs2019-nompi:test + - windows-vs2022-nompi:test variables: RSYNC_DESTINATION: paraview_nightly_bin diff --git a/.gitlab/ci/cdash-groups.json b/.gitlab/ci/cdash-groups.json index 8a2c8272b9b9d5d37fb34d306160f30bb1f73b6b..a35071b15690264abe8afc088f99d190b08e89c1 100644 --- a/.gitlab/ci/cdash-groups.json +++ b/.gitlab/ci/cdash-groups.json @@ -4,7 +4,7 @@ { "group": "master-packages", "site": "gitlab-ci", "buildname": "paraview-superbuild-branch-master-[linux_static]" }, { "group": "master-packages", "site": "gitlab-ci", "buildname": "paraview-superbuild-branch-master-[macos_arm64]" }, { "group": "master-packages", "site": "gitlab-ci", "buildname": "paraview-superbuild-branch-master-[macos_x86_64]" }, - { "group": "master-packages", "site": "gitlab-ci", "buildname": "paraview-superbuild-branch-master-[windows_vs2019_mpi]" }, - { "group": "master-packages", "site": "gitlab-ci", "buildname": "paraview-superbuild-branch-master-[windows_vs2019_nompi]" } + { "group": "master-packages", "site": "gitlab-ci", "buildname": "paraview-superbuild-branch-master-[windows_vs2022_mpi]" }, + { "group": "master-packages", "site": "gitlab-ci", "buildname": "paraview-superbuild-branch-master-[windows_vs2022_nompi]" } ] } diff --git a/.gitlab/ci/configure_common.cmake b/.gitlab/ci/configure_common.cmake index a746aeca90880cf420d9fec0b7c653bd12d2a25e..2c79a1ae51679af057eec80d53d5fa1e55b3539e 100644 --- a/.gitlab/ci/configure_common.cmake +++ b/.gitlab/ci/configure_common.cmake @@ -2,10 +2,6 @@ set(USE_NONFREE_COMPONENTS ON CACHE BOOL "") set(BUILD_TESTING ON CACHE BOOL "") set(GENERATE_SPDX ON CACHE BOOL "") -if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "linux") - set(FILE_COMMAND "/usr/bin/file" CACHE FILEPATH "") -endif () - # The new Mesa has issues with back screens when rendering. See # paraview/paraview#22152. set(mesa_SOURCE_SELECTION "21.2.1" CACHE STRING "") @@ -35,6 +31,7 @@ enable_project(gdal) enable_project(gmsh) enable_project(h5py) enable_project(launchers) +enable_project(libxslt) enable_project(lz4) enable_project(matplotlib) enable_project(medreader) @@ -66,7 +63,7 @@ enable_project(pythonmpi4py) enable_project(pythonnetcdf4) enable_project(pythonpandas) enable_project(pythonpygments) -enable_project(qt5) +enable_project(qt6) enable_project(scipy) enable_project(seacas) # needed to actually build exodus enable_project(silo) diff --git a/.gitlab/ci/configure_linux_common.cmake b/.gitlab/ci/configure_linux_common.cmake new file mode 100644 index 0000000000000000000000000000000000000000..30732f4bccbf0e3f2a391017562b02f1286fcd29 --- /dev/null +++ b/.gitlab/ci/configure_linux_common.cmake @@ -0,0 +1,7 @@ +# The `curl` build shadows the system `libcurl`. In an SSL-less build, this +# makes internal `git` usage unable to talk to `https` URLs. +set(PASS_LD_LIBRARY_PATH_FOR_BUILDS OFF CACHE BOOL "") + +set(FILE_COMMAND "/usr/bin/file" CACHE FILEPATH "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_linux_shared.cmake b/.gitlab/ci/configure_linux_shared.cmake index b86ce66e1bb85891d6035a1f2f7cd130fef5f9d7..e47af6433ef839534a74e6871fb14316e5f72402 100644 --- a/.gitlab/ci/configure_linux_shared.cmake +++ b/.gitlab/ci/configure_linux_shared.cmake @@ -10,4 +10,4 @@ set(ENABLE_openxrsdk ON CACHE BOOL "") set(ENABLE_collaborationserver ON CACHE BOOL "") set(ENABLE_zeromq ON CACHE BOOL "") -include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_linux_common.cmake") diff --git a/.gitlab/ci/configure_linux_static.cmake b/.gitlab/ci/configure_linux_static.cmake index eeac24a1e0dacb1324b9147d19bd9f1413773685..3e88b0042534162deb5f6ebab831ca761cd24ae3 100644 --- a/.gitlab/ci/configure_linux_static.cmake +++ b/.gitlab/ci/configure_linux_static.cmake @@ -13,7 +13,9 @@ set(ENABLE_catalyst ON CACHE BOOL "") set(ENABLE_mesa OFF CACHE BOOL "") set(ENABLE_nvidiaindex OFF CACHE BOOL "") set(ENABLE_qt5 OFF CACHE BOOL "") +set(ENABLE_qt6 OFF CACHE BOOL "") +set(ENABLE_libxslt OFF CACHE BOOL "") set(ENABLE_visrtx OFF CACHE BOOL "") set(ENABLE_vrpn OFF CACHE BOOL "") -include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_linux_common.cmake") diff --git a/.gitlab/ci/configure_windows_vs2019_mpi.cmake b/.gitlab/ci/configure_windows_vs2022_mpi.cmake similarity index 100% rename from .gitlab/ci/configure_windows_vs2019_mpi.cmake rename to .gitlab/ci/configure_windows_vs2022_mpi.cmake diff --git a/.gitlab/ci/configure_windows_vs2019_nompi.cmake b/.gitlab/ci/configure_windows_vs2022_nompi.cmake similarity index 100% rename from .gitlab/ci/configure_windows_vs2019_nompi.cmake rename to .gitlab/ci/configure_windows_vs2022_nompi.cmake diff --git a/.gitlab/ci/docker/centos7/install_cuda.sh b/.gitlab/ci/docker/centos7/install_cuda.sh deleted file mode 100755 index 83889f3f649a4761a38f47677b6cd41ce90b1e23..0000000000000000000000000000000000000000 --- a/.gitlab/ci/docker/centos7/install_cuda.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -set -e - -# Install the nvidia repository. -yum-config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/rhel7/x86_64/cuda-rhel7.repo - -# Install CUDA toolchains. -yum install -y \ - cuda-compiler-12-2 cuda-cudart-devel-12-2 cuda-toolkit-12-2 - -yum clean all diff --git a/.gitlab/ci/docker/centos7/install_deps.sh b/.gitlab/ci/docker/centos7/install_deps.sh deleted file mode 100755 index 54b891fd1e32b094fccf5e9b0debe987a7c474be..0000000000000000000000000000000000000000 --- a/.gitlab/ci/docker/centos7/install_deps.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -set -e - -# Install build requirements. -yum install -y \ - freeglut-devel glew-devel graphviz-devel \ - libxcb-devel libXt-devel xcb-util-wm-devel xcb-util-devel \ - xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel \ - libXcursor-devel mesa-libGL-devel mesa-libEGL-devel \ - libxkbcommon-devel libxkbcommon-x11-devel file mesa-dri-drivers autoconf \ - automake libtool chrpath bison flex libXrandr-devel \ - alsa-lib-devel - -# Install EPEL -yum install -y \ - epel-release - -# Install development tools -yum install -y \ - git-lfs - -# Install toolchains. -yum install -y \ - centos-release-scl -yum install -y \ - devtoolset-10-gcc-c++ \ - devtoolset-10 \ - devtoolset-10-gcc \ - devtoolset-10-gfortran \ - rh-git227-git-core - -yum clean all diff --git a/.gitlab/ci/docker/centos7/Dockerfile b/.gitlab/ci/docker/centos8/Dockerfile similarity index 91% rename from .gitlab/ci/docker/centos7/Dockerfile rename to .gitlab/ci/docker/centos8/Dockerfile index c295d01e0a04a6e096e0fa56e68146d274d148a0..0b2b9f06e50fc22d1ca06a2719540f6b7083080f 100644 --- a/.gitlab/ci/docker/centos7/Dockerfile +++ b/.gitlab/ci/docker/centos8/Dockerfile @@ -1,4 +1,4 @@ -FROM centos:7 +FROM almalinux:8 MAINTAINER Ben Boeckel COPY install_deps.sh /root/install_deps.sh diff --git a/.gitlab/ci/docker/centos8/install_cuda.sh b/.gitlab/ci/docker/centos8/install_cuda.sh new file mode 100755 index 0000000000000000000000000000000000000000..b2e9016859c022a132926ad7bbb979b01ab99713 --- /dev/null +++ b/.gitlab/ci/docker/centos8/install_cuda.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +# Install the nvidia repository. +dnf config-manager --add-repo \ + https://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/cuda-rhel8.repo + +# Install CUDA toolchains. +dnf install -y \ + cuda-compiler-12-6 cuda-cudart-devel-12-6 cuda-toolkit-12-6 + +dnf clean all diff --git a/.gitlab/ci/docker/centos8/install_deps.sh b/.gitlab/ci/docker/centos8/install_deps.sh new file mode 100755 index 0000000000000000000000000000000000000000..2afe1fa32d2578fc0ba2a771cc3237f635c99ace --- /dev/null +++ b/.gitlab/ci/docker/centos8/install_deps.sh @@ -0,0 +1,51 @@ +#!/bin/sh + +set -e + +# mirrorlist.centos.org no longer exists because el8 is past end of life. +# To get packages, replace mirrorlist with baseurl and change mirror.centos.org +# to vault.centos.org. +# sed -i \ +# -e s/mirror.centos.org/vault.centos.org/g \ +# -e s/^#.*baseurl=http/baseurl=http/g \ +# -e s/^mirrorlist=http/#mirrorlist=http/g \ +# /etc/yum.repos.d/CentOS-*.repo + +# Install EPEL +dnf install -y \ + epel-release + +# Install tools to manage repositories. +dnf install -y --setopt=install_weak_deps=False \ + 'dnf-command(config-manager)' + +dnf config-manager --set-enabled powertools + +# Install build requirements. +dnf install -y --setopt=install_weak_deps=False \ + freeglut-devel glew-devel graphviz-devel \ + libxcb-devel libXt-devel xcb-util-wm-devel xcb-util-devel \ + xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel \ + xcb-util-cursor libXcursor-devel mesa-libGL-devel mesa-libEGL-devel \ + libxkbcommon-devel libxkbcommon-x11-devel file mesa-dri-drivers autoconf \ + automake libtool chrpath bison flex libXrandr-devel \ + alsa-lib-devel mesa-vulkan-devel + +# Install development tools +dnf install -y --setopt=install_weak_deps=False \ + git-lfs + +# Install toolchains. +dnf install -y --setopt=install_weak_deps=False \ + gcc-toolset-10-toolchain \ + gcc-toolset-10-gcc \ + gcc-toolset-10-gcc-c++ \ + gcc-toolset-10-gcc-gfortran + +# sed -i \ +# -e s/mirror.centos.org/vault.centos.org/g \ +# -e s/^#.*baseurl=http/baseurl=http/g \ +# -e s/^mirrorlist=http/#mirrorlist=http/g \ +# /etc/yum.repos.d/CentOS-*.repo + +dnf clean all diff --git a/.gitlab/ci/docker/fedora38/Dockerfile b/.gitlab/ci/docker/fedora38/Dockerfile index 78d857d082fc2bd1acd69d1d3401495ba583ceb6..184c0b8cc29dd4cca6a1db591255d69fbc93210a 100644 --- a/.gitlab/ci/docker/fedora38/Dockerfile +++ b/.gitlab/ci/docker/fedora38/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER Ben Boeckel RUN dnf install --setopt=install_weak_deps=False -y \ /usr/bin/glxinfo git mesa-dri-drivers mesa-libGL* \ - libXcursor-devel libxcrypt-compat libxkbcommon \ + libXcursor xcb-util-cursor libxcrypt-compat libxkbcommon \ libxkbcommon-x11 xcb-util-image xcb-util-wm xcb-util xcb-util-image \ - xcb-util-keysyms xcb-util-renderutil file \ + xcb-util-keysyms xcb-util-renderutil file dbus-libs \ && dnf clean all diff --git a/.gitlab/ci/download_qt.cmake b/.gitlab/ci/download_qt.cmake index 3d303311b01625bba500aabb0009b1276294f055..609734dcb950b75b7311e9e93db2d00e6e786601 100644 --- a/.gitlab/ci/download_qt.cmake +++ b/.gitlab/ci/download_qt.cmake @@ -14,7 +14,8 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2015") set(msvc_year "2015") set(qt_abi "win64_msvc${msvc_year}_64") elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2017" OR - "$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2019") + "$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2019" OR + "$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2022") set(qt_platform "windows_x86") set(msvc_year "2019") set(qt_abi "win64_msvc${msvc_year}_64") diff --git a/.gitlab/ci/download_qt6.cmake b/.gitlab/ci/download_qt6.cmake new file mode 100644 index 0000000000000000000000000000000000000000..ab010f6dcaee2aef6095567965d0810b7e2407ba --- /dev/null +++ b/.gitlab/ci/download_qt6.cmake @@ -0,0 +1,142 @@ +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) + 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) + 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}") + list(APPEND qt_files + "qt.qt6.${qt_version_nodot}${qt_addon_directory_for_${qt_component}}.${qt_abi}/${qt_file_name_prefix}icu-linux-Rhel8.6-x86_64.7z") + + foreach (qt_component IN ITEMS qtbase qtsvg qttools qtmultimedia qt5compat) + 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 () + + set(qt_updir "") + set(qt_subdir "") + if (qt_filename MATCHES "icu-linux") + set(qt_updir "../") + set(qt_subdir "/lib") + file(MAKE_DIRECTORY ".gitlab/qt6${qt_subdir}") + endif () + + # Extract the file. + execute_process( + COMMAND + "${CMAKE_COMMAND}" + -E tar + xf "${qt_updir}../${qt_filename}" + WORKING_DIRECTORY ".gitlab/qt6${qt_subdir}" + 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 0000000000000000000000000000000000000000..dc61dcbdea5941a24a5f45a731ff768b2941a083 --- /dev/null +++ b/.gitlab/ci/download_qt6_hashes.cmake @@ -0,0 +1,24 @@ +# Lines can be generated by doing: +# +# sha256sum $files | awk '{ print "set(\"" $2 "_hash\" " $1 ")" }' >> $thisfile + +set("6.9.0-0-202501171339icu-linux-Rhel8.6-x86_64.7z_hash" 7025758f30a5b06760e7e050d8feec0188a868e0c1c86b605f7b695e07f4dd1a) +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-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-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) diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index f2c69aa4536eea5027537664b19403cda789786e..ebb75586ddd177f1cdb541d05171b0a60396ced1 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -4,33 +4,33 @@ ### CentOS # -# CentOS 7 is the primary deployment platform. This gains us maximum +# CentOS 8 is the primary deployment platform. This gains us maximum # compatibility with many Linux distros while also providing easy ways to get # newer compilers. -.centos7: - image: "kitware/paraview:ci-superbuild-centos7-20230915" +.centos8: + image: "kitware/paraview:ci-superbuild-centos8-20250227" variables: GIT_SUBMODULE_STRATEGY: none - LAUNCHER: "scl enable devtoolset-10 rh-git227 --" + LAUNCHER: "scl enable gcc-toolset-10 --" GIT_CLONE_PATH: $CI_BUILDS_DIR/gitlab-kitware-sciviz-ci - CUDACXX: "/usr/local/cuda-12.2/bin/nvcc" + CUDACXX: "/usr/local/cuda-12.6/bin/nvcc" -.centos7_shared: - extends: .centos7 +.centos8_shared: + extends: .centos8 variables: CMAKE_CONFIGURATION: linux_shared -.centos7_static: - extends: .centos7 +.centos8_static: + extends: .centos8 variables: CMAKE_CONFIGURATION: linux_static .fedora38: - image: "kitware/paraview:ci-superbuild-fedora38-20231215" + image: "kitware/paraview:ci-superbuild-fedora38-20250220" variables: GIT_SUBMODULE_STRATEGY: none @@ -72,6 +72,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 # `git submodule foreach` does not consider submodules that have not been # initialized. So here, we initialize what we can and ignore failure so # that we can set up submodules properly later. diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index 66f537675811b9d1680ce138f19bdea7a7ff1d10..e09ecf5beea1e366d5dfef4f0ed3f1e5ccde44ca 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -83,8 +83,8 @@ - ninja --version - 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/qt6 - git submodule foreach --recursive cmake -P "$PWD/.gitlab/ci/fetch_submodule.cmake" - git submodule sync --recursive - git submodule update --init --recursive diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 054fcd4efc82bd83d0f6fdfa7d47294fad29c011..d0efbbf371c0fdc0983fb304b966246c01f35576 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -25,44 +25,44 @@ # from GitLab-CI by default (it runs as a Windows service). QT_OPENGL: desktop -.windows_vs2019: +.windows_vs2022: extends: .windows_build variables: - VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" + VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64" - VCVARSVERSION: "14.28.29910" + VCVARSVERSION: "14.35.32215" -.windows_vs2019_mpi: - extends: .windows_vs2019 +.windows_vs2022_mpi: + extends: .windows_vs2022 variables: - CMAKE_CONFIGURATION: windows_vs2019_mpi + CMAKE_CONFIGURATION: windows_vs2022_mpi -.windows_vs2019_nompi: - extends: .windows_vs2019 +.windows_vs2022_nompi: + extends: .windows_vs2022 variables: - CMAKE_CONFIGURATION: windows_vs2019_nompi + CMAKE_CONFIGURATION: windows_vs2022_nompi ## Tags .windows_builder_tags: tags: - paraview # Since this is a bare runner, pin to a project. - - msvc-19.28-16.9 + - msvc-19.35 - nonconcurrent - shell - - vs2019 + - vs2022 - windows-x86_64 .windows_test_tags: tags: - paraview # Since this is a bare runner, pin to a project. - - msvc-19.28-16.9 + - msvc-19.35 - nonconcurrent - shell - - vs2019 + - vs2022 - windows-x86_64 - test # Some machines have trouble running tests. @@ -90,8 +90,8 @@ - Set-Item -Force -Path "env:PARAVIEW_COMMIT_SHORT_SHA" -Value "$paraview_commit_short_sha" .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\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" diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b8420e776fe20f31f40af1ed0def9da28bf44f5..33eaabcb06d1183c96ba5553a7a0247eed45fc41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,8 @@ function (superbuild_find_projects var) lapack las libjpegturbo + libxml2 + libxslt lookingglass lz4 matplotlib @@ -159,7 +161,9 @@ function (superbuild_find_projects var) pythonyarl pytz qhull + qt qt5 + qt6 rkcommon scipy seacas @@ -198,7 +202,6 @@ function (superbuild_find_projects var) fortran genericio gmsh - libxml2 mili rapidjson surfacetrackercut) @@ -297,6 +300,10 @@ function (superbuild_sanity_check) message(WARNING "ParaView is disabled...") endif () + if (qt5_enabeld AND qt6_enabled) + message(SEND_ERROR "Only one of Qt5 and Qt6 may be enabled") + endif () + # Sanity check: Cannot have paraview and have cxx11 disabled. if (NOT cxx11_enabled AND paraview_enabled) #While ParaView doesn't depend on cxx11 it needs to make sure that @@ -333,10 +340,12 @@ function (superbuild_add_packaging) endif () list(GET generators 0 default_generator) - if (APPLE OR WIN32) - option(PACKAGE_SYSTEM_QT "With USE_SYSTEM_Qt5, package the system Qt during packaging step" ON) - mark_as_advanced(PACKAGE_SYSTEM_QT) + set(default_qt_package_system OFF) + if (APPLE OR WIN32 OR qt6_enabled) + set(default_qt_package_system ON) endif() + option(PACKAGE_SYSTEM_QT "With USE_SYSTEM_Qt5, package the system Qt during packaging step" "${default_qt_package_system}") + mark_as_advanced(PACKAGE_SYSTEM_QT) list(APPEND superbuild_export_variables paraview_always_package_scipy @@ -356,6 +365,17 @@ function (superbuild_add_packaging) qt5_ENABLE_MULTIMEDIA qt5_ENABLE_WEBENGINE) + if (qt6_enabled) + list(APPEND superbuild_export_variables + Qt6_DIR) + find_package(Qt6 QUIET REQUIRED COMPONENTS Core) + set(qt6_version "${Qt6Core_VERSION_MAJOR}.${Qt6Core_VERSION_MINOR}") + endif () + list(APPEND superbuild_export_variables + qt6_version + qt6_ENABLE_MULTIMEDIA + qt6_ENABLE_WEBENGINE) + if (NOT DEFINED PARAVIEW_CATALYST_EDITION) set(PARAVIEW_CATALYST_EDITION Full) endif () @@ -525,6 +545,7 @@ set(_superbuild_ospray_default_selection "2.7.1") # Force qt SVG support, so ParaView can use SVG icons set(qt5_ENABLE_SVG ON CACHE INTERNAL "ParaView requires SVG support") +set(qt6_ENABLE_SVG ON CACHE INTERNAL "ParaView requires SVG support") # ParaView's superbuild does not support static-everywhere builds. But let # people around the check if they want it. diff --git a/README.md b/README.md index ead5e94f52667ce96877c842e64462274e089993..f7e06adb7fc059dfeba315192194a47b106b4b8d 100644 --- a/README.md +++ b/README.md @@ -134,9 +134,9 @@ The `paraviewgettingstartedguide`, and `paraviewtutorialdata` packages add startup documentation and example data to the package. ParaView supports multiple rendering engines including `egl`, `mesa`, -`osmesa`, and `qt5`. All of these are incompatible with each other. If none of +`osmesa`, and `qt6`. All of these are incompatible with each other. If none of these are chosen, a UI-less ParaView will be built (basically just -`pvpython`). On Windows and macOS, only the `qt5` rendering engine is +`pvpython`). On Windows and macOS, only the `qt6` rendering engine is available. The `python` package is available to enable Python support in the package. In diff --git a/launchers/CMakeLists.txt b/launchers/CMakeLists.txt index 25d06bb4696fcbd7cc5641a316d73945bc36363e..07a53e1f36a5be73678b8aa76eaedddebf308865 100644 --- a/launchers/CMakeLists.txt +++ b/launchers/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.12) project(launchers) -find_package(ParaView REQUIRED) +find_package(ParaView REQUIRED COMPONENTS Versioning) option(LAUNCHER_ENABLE_MESA "Enable Mesa launch option" OFF) option(LAUNCHER_ENABLE_OSMESA "Enable OSMesa launch option" OFF) diff --git a/projects/apple-unix/mili.cmake b/projects/apple-unix/mili.cmake index a4bf514294f4cc1c3c53f178059ff8a934fe3522..135fa1ee6b61a48c1dccad605aa2150dd8666afe 100644 --- a/projects/apple-unix/mili.cmake +++ b/projects/apple-unix/mili.cmake @@ -33,6 +33,8 @@ if (APPLE) endif() superbuild_apply_patch(mili darwin-patch3 "Mili Darwin patch 3") +superbuild_apply_patch(mili buildinfo-crash "Fix buildinfo crashes") + superbuild_add_extra_cmake_args( -DMili_INCLUDE_DIR:PATH=/include/mili -DMili_LIBRARY:PATH=/lib/libmili.a diff --git a/projects/apple-unix/patches/mili-buildinfo-crash.patch b/projects/apple-unix/patches/mili-buildinfo-crash.patch new file mode 100644 index 0000000000000000000000000000000000000000..f49684b86edf4a7fee0f8f20adbb6047143f1775 --- /dev/null +++ b/projects/apple-unix/patches/mili-buildinfo-crash.patch @@ -0,0 +1,29 @@ +diff -u -Nr -U5 mili-15.1/src/buildinfo.c mili-15.1.buildinfo-crash/src/buildinfo.c +--- mili-15.1/src/buildinfo.c 2016-07-21 21:25:03.000000000 +0200 ++++ mili-15.1.buildinfo-crash/src/buildinfo.c 2025-02-07 00:49:35.567553521 +0100 +@@ -101,11 +101,11 @@ + struct utsname u_info; + #endif + time_t time_info; + char *ctime_string; + FILE *fp; +- char *module_lst; ++ char module_lst[4096]; + int recordcount; + + fprintf(outfile, "#define BI_VERSION \"%s-%s\"\n", + PACKAGE_NAME, PACKAGE_VERSION); + +@@ -127,11 +127,11 @@ + } + else + { + fprintf(outfile, "#define BI_MODULES \""); + recordcount = 0; +- module_lst = ""; ++ module_lst[0] = '\0'; + while ( !feof(fp) ) + { + recordcount++; + fscanf(fp, "%s", module_lst); + fprintf(outfile, " %s", module_lst); diff --git a/projects/apple-unix/surfacetrackercut.cmake b/projects/apple-unix/surfacetrackercut.cmake index ba6488786fad64a420ea3f74b97f625e66b377c6..67b8c9a2ace76812dc27f91748b76d9e853b242a 100644 --- a/projects/apple-unix/surfacetrackercut.cmake +++ b/projects/apple-unix/surfacetrackercut.cmake @@ -6,7 +6,7 @@ superbuild_add_project(surfacetrackercut SPDX_COPYRIGHT_TEXT "Copyright (c) 2022, Connie He" DEPENDS paraview lapack - DEPENDS_OPTIONAL qt5 + DEPENDS_OPTIONAL qt5 qt6 SOURCE_SUBDIR SurfaceTrackerCut CMAKE_ARGS -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} diff --git a/projects/apple/paraview.bundle.cmake b/projects/apple/paraview.bundle.cmake index 718604c4b02cb46f6b9cb7cd8342ae3b8e99afe2..99bf16c35ce5c090ea7b3beccc09a70a1134c304 100644 --- a/projects/apple/paraview.bundle.cmake +++ b/projects/apple/paraview.bundle.cmake @@ -218,7 +218,7 @@ foreach (executable IN LISTS paraview_executables other_executables) IGNORE_REGEXES ${ignore_regexes}) endforeach () -if (qt5_enabled) +if (qt5_enabled OR qt6_enabled) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" "[Paths]\nPlugins = Plugins\n") install( FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" @@ -316,6 +316,20 @@ foreach (qt5_plugin_path IN LISTS qt5_plugin_paths) IGNORE_REGEXES ${ignore_regexes}) endforeach () +foreach (qt6_plugin_path IN LISTS qt6_plugin_paths) + get_filename_component(qt6_plugin_group "${qt6_plugin_path}" DIRECTORY) + get_filename_component(qt6_plugin_group "${qt6_plugin_group}" NAME) + + superbuild_apple_install_module( + "\${CMAKE_INSTALL_PREFIX}" + "${paraview_appname}" + "${qt6_plugin_path}" + "Contents/Plugins/${qt6_plugin_group}" + SEARCH_DIRECTORIES "${superbuild_install_location}/lib" + INCLUDE_REGEXES ${include_regexes} + IGNORE_REGEXES ${ignore_regexes}) +endforeach () + paraview_install_extra_data() if (proj_enabled) diff --git a/projects/files/Qt6.LICENSE b/projects/files/Qt6.LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..ad4c1ed2e2694a3a69c2351f67f6b2cfbafc1c3d --- /dev/null +++ b/projects/files/Qt6.LICENSE @@ -0,0 +1,861 @@ + GNU LESSER GENERAL PUBLIC LICENSE + + The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. + Contact: http://www.qt.io/licensing/ + + You may use, distribute and copy the Qt Toolkit under the terms of + GNU Lesser General Public License version 3, which is displayed below. + This license makes reference to the version 3 of the GNU General + Public License, which you can find in the LICENSE.GPLv3 file. + +------------------------------------------------------------------------- + + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright © 2007 Free Software Foundation, Inc. +Everyone is permitted to copy and distribute verbatim copies of this +licensedocument, but changing it is not allowed. + +This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + +0. Additional Definitions. + + As used herein, “this License” refers to version 3 of the GNU Lesser +General Public License, and the “GNU GPL” refers to version 3 of the +GNU General Public License. + + “The Library” refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An “Application” is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A “Combined Work” is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the “Linked +Version”. + + The “Minimal Corresponding Source” for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The “Corresponding Application Code” for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + +1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + +2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort + to ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + +3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this + license document. + +4. Combined Works. + + You may convey a Combined Work under terms of your choice that, taken +together, effectively do not restrict modification of the portions of +the Library contained in the Combined Work and reverse engineering for +debugging such modifications, if you also do each of the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this + license document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of + this License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with + the Library. A suitable mechanism is one that (a) uses at run + time a copy of the Library already present on the user's + computer system, and (b) will operate properly with a modified + version of the Library that is interface-compatible with the + Linked Version. + + e) Provide Installation Information, but only if you would + otherwise be required to provide such information under section 6 + of the GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the Application + with a modified version of the Linked Version. (If you use option + 4d0, the Installation Information must accompany the Minimal + Corresponding Source and Corresponding Application Code. If you + use option 4d1, you must provide the Installation Information in + the manner specified by section 6 of the GNU GPL for conveying + Corresponding Source.) + +5. Combined Libraries. + + You may place library facilities that are a work based on the Library +side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities, conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of + it is a work based on the Library, and explaining where to find + the accompanying uncombined form of the same work. + +6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +as you received it specifies that a certain numbered version of the +GNU Lesser General Public License “or any later version” applies to +it, you have the option of following the terms and conditions either +of that published version or of any later version published by the +Free Software Foundation. If the Library as you received it does not +specify a version number of the GNU Lesser General Public License, +you may choose any version of the GNU Lesser General Public License +ever published by the Free Software Foundation. + +If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the Library. + + GNU GENERAL PUBLIC LICENSE + + The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. + Contact: http://www.qt.io/licensing/ + + You may use, distribute and copy the Qt Toolkit under the terms of + GNU Lesser General Public License version 3. That license references + the General Public License version 3, that is displayed below. Other + portions of the Qt Toolkit may be licensed directly under this license. + +------------------------------------------------------------------------- + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/projects/launchers.cmake b/projects/launchers.cmake index 16687884e86ffb06f9a7a0ac1bd6fe5346bc3048..2bd0e10157d1bf6896eaaf0e37723dba6aee61bf 100644 --- a/projects/launchers.cmake +++ b/projects/launchers.cmake @@ -1,6 +1,6 @@ superbuild_add_project(launchers DEPENDS paraview - DEPENDS_OPTIONAL mesa osmesa mpi qt5 + DEPENDS_ORDERED mesa osmesa mpi qt5 qt6 CMAKE_ARGS -DCMAKE_INSTALL_BINDIR:PATH=bin diff --git a/projects/lookingglass.cmake b/projects/lookingglass.cmake index 4c780d62d28260798c7306b7d2fb6137e3676f69..1219efcce1938b45eba6451d7b2f462a89ca2d00 100644 --- a/projects/lookingglass.cmake +++ b/projects/lookingglass.cmake @@ -1,5 +1,7 @@ superbuild_add_project(lookingglass - DEPENDS qt5 + DEPENDS qt + DEPENDS_OPTIONAL + qt5 qt6 LICENSE_FILES LICENSE.txt SPDX_LICENSE_IDENTIFIER diff --git a/projects/medreader.cmake b/projects/medreader.cmake index d49369f9f1c4f88f41ebec6a3f985d78ec480daf..5bf82a06a080a2bf92fbeadfe9c1bd63bcb932bc 100644 --- a/projects/medreader.cmake +++ b/projects/medreader.cmake @@ -1,12 +1,19 @@ set(medreader_options) if (UNIX AND NOT APPLE) + set(medreader_rpath_entries + /lib) + if (qt6_enabled) + list(APPEND medreader_rpath_entries + "${qt6_rpath}") + endif () + list(JOIN medreader_rpath_entries "${_superbuild_list_separator}" medreader_rpath_entries) list(APPEND medreader_options - -DCMAKE_INSTALL_RPATH:STRING=/lib) + -DCMAKE_INSTALL_RPATH:STRING=${medreader_rpath_entries}) endif () superbuild_add_project(medreader DEPENDS medfile medconfiguration medcoupling paraview - DEPENDS_OPTIONAL mpi qt5 + DEPENDS_OPTIONAL mpi qt5 qt6 LICENSE_FILES COPYING SPDX_LICENSE_IDENTIFIER LGPL-2.1-or-later @@ -38,3 +45,6 @@ superbuild_apply_patch(medreader quadrature-dataset superbuild_apply_patch(medreader fix-vtkStdString-usage "Fix vtkStdString usage") + +superbuild_apply_patch(medreader pqTreeWidget-margins-api + "Fix pqTreeWidget deprecated margin API usage") diff --git a/projects/paraview.bundle.common.cmake b/projects/paraview.bundle.common.cmake index c982f52f367c2ca5bc957ec5a2c97638d16deba7..99fde4b9475ab04caa72f59310363fbdc298f317 100644 --- a/projects/paraview.bundle.common.cmake +++ b/projects/paraview.bundle.common.cmake @@ -47,7 +47,8 @@ endif () # Set the license files. set(CPACK_RESOURCE_FILE_LICENSE "${superbuild_install_location}/share/licenses/ParaView/Copyright.txt") -set(qt_license_file "${CMAKE_CURRENT_LIST_DIR}/files/Qt5.LICENSE") +set(qt5_license_file "${CMAKE_CURRENT_LIST_DIR}/files/Qt5.LICENSE") +set(qt6_license_file "${CMAKE_CURRENT_LIST_DIR}/files/Qt6.LICENSE") # Set the translations to bundle set(paraview_languages "fr_FR") @@ -63,7 +64,7 @@ if (python3_enabled) endif () set(paraview_has_gui FALSE) -if (qt5_enabled) +if (qt5_enabled OR qt6_enabled) list(APPEND paraview_executables paraview) set(paraview_has_gui TRUE) @@ -417,6 +418,7 @@ macro (remove_not_packaged_projects) # Do not install license of non-packaged projects list(REMOVE_ITEM packaged_projects gperf + libxslt medconfiguration meson ninja @@ -459,10 +461,16 @@ function (paraview_install_all_licenses) # When packaging system qt, install the license manually if (qt5_plugin_paths) install( - FILES "${qt_license_file}" + FILES "${qt5_license_file}" DESTINATION "${paraview_license_path}/qt5" COMPONENT superbuild) endif () + if (qt6_plugin_paths) + install( + FILES "${qt6_license_file}" + DESTINATION "${paraview_license_path}/qt6" + COMPONENT superbuild) + endif () endfunction () function (paraview_install_all_spdx_files) @@ -507,7 +515,7 @@ function (paraview_install_extra_data) paraview_install_all_spdx_files() endif () - if (paraview_translations_dir AND qt5_enabled) + if (paraview_translations_dir AND (qt5_enabled OR qt6_enabled)) paraview_install_translations(paraviewtranslations "translations/") endif() @@ -564,6 +572,44 @@ else () set(qt5_plugin_paths) endif () +if (qt6_enabled AND (NOT USE_SYSTEM_qt6 OR PACKAGE_SYSTEM_QT)) + include(qt6.functions) + + set(qt6_plugin_prefix) + if (NOT WIN32) + set(qt6_plugin_prefix "lib") + endif () + + # Add SVG support, so ParaView can use SVG icons + set(qt6_plugins + iconengines/${qt6_plugin_prefix}qsvgicon + imageformats/${qt6_plugin_prefix}qsvg + sqldrivers/${qt6_plugin_prefix}qsqlite) + + if (WIN32) + list(APPEND qt6_plugins + platforms/qwindows + styles/qmodernwindowsstyle) + elseif (APPLE) + list(APPEND qt6_plugins + platforms/libqcocoa + styles/libqmacstyle) + elseif (UNIX) + list(APPEND qt6_plugins + egldeviceintegrations/libqeglfs-x11-integration + generic/libqevdevkeyboardplugin + generic/libqevdevmouseplugin + platforms/libqxcb + platforminputcontexts/libcomposeplatforminputcontextplugin + xcbglintegrations/libqxcb-egl-integration + xcbglintegrations/libqxcb-glx-integration) + endif () + + superbuild_get_qt6_plugin_install_paths(qt6_plugin_paths ${qt6_plugins}) +else () + set(qt6_plugin_paths) +endif () + if (socat_built_by_superbuild) include(socat.bundle) endif () diff --git a/projects/paraview.cmake b/projects/paraview.cmake index d96fb8e6ae6665ae19bc75a2496ddf744ef5ed11..0984cb07b25de58d401dca8cad0685965b0e68df 100644 --- a/projects/paraview.cmake +++ b/projects/paraview.cmake @@ -41,9 +41,6 @@ if (UNIX) if (NOT APPLE) list(APPEND paraview_platform_dependencies mesa - # OSMesa is only built to support users on bespoke linux systems that do not have an OSMesa library. - # The OSMesa library/headers are not really required at compile time. - osmesa openxrsdk zeromq @@ -56,6 +53,22 @@ if (UNIX) genericio cosmotools) endif () +# 5.13 support. +set(paraview_5_13_args) +if (paraview_SOURCE_SELECTION MATCHES "^5\\.13") + if (UNIX AND NOT APPLE) + list(APPEND paraview_platform_dependencies + # OSMesa is only built to support users on bespoke linux systems that do not have an OSMesa library. + # The OSMesa library/headers are not really required at compile time. + osmesa + egl) + list(APPEND paraview_5_13_args + -DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN:BOOL=${osmesa_enabled} + -DVTK_OPENGL_HAS_EGL:BOOL=${egl_enabled} + -DVTK_OPENGL_HAS_OSMESA:BOOL=${osmesa_enabled}) + endif () +endif () + if (WIN32) list(APPEND paraview_platform_dependencies openvr openxrremoting openxrsdk zeromq) @@ -219,13 +232,24 @@ if (openvdb_enabled) -DPARAVIEW_RELOCATABLE_INSTALL:BOOL=OFF) endif () +if (qt5_enabled) + set(paraview_dsp_audio_player "${qt5_ENABLE_MULTIMEDIA}") + set(paraview_enable_webengine "${qt5_ENABLE_WEBENGINE}") + set(paraview_qt_enabled "${qt5_enabled}") +endif () +if (qt6_enabled) + set(paraview_dsp_audio_player "${qt6_ENABLE_MULTIMEDIA}") + set(paraview_enable_webengine "${qt6_ENABLE_WEBENGINE}") + set(paraview_qt_enabled "${qt6_enabled}") +endif () + superbuild_add_project(paraview DEBUGGABLE DEFAULT_ON DEPENDS cxx11 DEPENDS_OPTIONAL adios2 alembic catalyst cuda boost eigen gdal hdf5 matplotlib mpi numpy pdal png - protobuf python3 qt5 visitbridge zlib silo las lookingglass pythonmpi4py + protobuf python3 qt5 qt6 visitbridge zlib silo las lookingglass pythonmpi4py xdmf3 vrpn vtkm netcdf openturns openmp @@ -240,6 +264,7 @@ superbuild_add_project(paraview tbb ospray sqlite tiff proj exodus seacas occt + libxslt ${PARAVIEW_EXTERNAL_PROJECTS} CMAKE_ARGS -DCMAKE_INSTALL_LIBDIR:PATH=lib @@ -271,7 +296,7 @@ superbuild_add_project(paraview -DPARAVIEW_PLUGIN_ENABLE_GmshIO:BOOL=${gmsh_enabled} -DPARAVIEW_PLUGIN_ENABLE_LookingGlass:BOOL=${lookingglass_enabled} -DPARAVIEW_PLUGIN_ENABLE_NodeEditor:BOOL=${PARAVIEW_ENABLE_NODEEDITOR} - -DPARAVIEW_PLUGIN_dsp_enable_audio_player:BOOL=${qt5_ENABLE_MULTIMEDIA} + -DPARAVIEW_PLUGIN_dsp_enable_audio_player:BOOL=${paraview_dsp_audio_player} -DPARAVIEW_PLUGIN_ENABLE_XRInterface:BOOL=${paraview_xrinterface_plugin_enabled} -DPARAVIEW_PLUGIN_ENABLE_zSpace:BOOL=${zspace_enabled} -DPARAVIEW_PLUGIN_ENABLE_NetCDFTimeAnnotationPlugin:BOOL=${pythoncftime_enabled} @@ -285,14 +310,12 @@ superbuild_add_project(paraview -DPARAVIEW_USE_MPI:BOOL=${mpi_enabled} -DPARAVIEW_USE_FORTRAN:BOOL=${fortran_enabled} -DPARAVIEW_USE_PYTHON:BOOL=${paraview_use_python} - -DPARAVIEW_USE_QT:BOOL=${qt5_enabled} + -DPARAVIEW_USE_QT:BOOL=${paraview_qt_enabled} -DPARAVIEW_USE_SERIALIZATION:BOOL=ON - -DPARAVIEW_QT_VERSION:STRING=5 - -DVTK_QT_VERSION:STRING=5 + -DPARAVIEW_QT_VERSION:STRING=${qt_version} + -DVTK_QT_VERSION:STRING=${qt_version} -DVISIT_BUILD_READER_Mili:BOOL=${mili_enabled} -DVISIT_BUILD_READER_Silo:BOOL=${silo_enabled} - # Not required in master, but needed for 5.13 - # -DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN:BOOL=${osmesa_enabled} -DVTK_ENABLE_VR_COLLABORATION:BOOL=${paraview_vr_collaboration_enabled} -DVTK_MODULE_USE_EXTERNAL_VTK_eigen=${eigen_enabled} -DVTK_MODULE_USE_EXTERNAL_ParaView_protobuf:BOOL=${protobuf_enabled} @@ -308,9 +331,7 @@ superbuild_add_project(paraview -DVTK_MODULE_USE_EXTERNAL_VTK_sqlite:BOOL=${sqlite_enabled} -DVTK_MODULE_USE_EXTERNAL_VTK_tiff:BOOL=${tiff_enabled} -DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=${zlib_enabled} - # Not required in master, but needed for 5.13 - # -DVTK_OPENGL_HAS_EGL:BOOL=${egl_enabled} - # -DVTK_OPENGL_HAS_OSMESA:BOOL=${osmesa_enabled} + ${paraview_5_13_args} -DVTK_SMP_IMPLEMENTATION_TYPE:STRING=${paraview_smp_backend} -DVTK_SMP_ENABLE_TBB:BOOL=${tbb_enabled} -DVTK_SMP_ENABLE_OPENMP:BOOL=${openmp_enabled} @@ -338,7 +359,7 @@ superbuild_add_project(paraview # Web -DPARAVIEW_ENABLE_WEB:BOOL=${paraviewweb_enabled} - -DPARAVIEW_ENABLE_QTWEBENGINE:BOOL=${qt5_ENABLE_WEBENGINE} + -DPARAVIEW_ENABLE_QTWEBENGINE:BOOL=${paraview_enable_webengine} # Readers -DVTK_MODULE_ENABLE_VTK_IOSegY:STRING=YES diff --git a/projects/paraview.plugin.cmake b/projects/paraview.plugin.cmake index d98d9b502f55f16b4cbe199858bfa31b79d20122..bb2bd38b1e74e6522d8641768b6d99dc66155f33 100644 --- a/projects/paraview.plugin.cmake +++ b/projects/paraview.plugin.cmake @@ -32,7 +32,7 @@ endif () superbuild_add_project("${plugin_project}" DEPENDS paraview ${${plugin_project}_depends} - DEPENDS_OPTIONAL ${${plugin_project}_depends_optional} qt5 + DEPENDS_OPTIONAL ${${plugin_project}_depends_optional} qt5 qt6 CMAKE_ARGS -DParaView_DIR:PATH=${paraview_binary_dir} diff --git a/projects/paraviewtranslations.cmake b/projects/paraviewtranslations.cmake index e9389fa48c643082cd1db1137c50053155c41dfe..47a337bd5bc85f5e86707d2963019ccfd123cd8d 100644 --- a/projects/paraviewtranslations.cmake +++ b/projects/paraviewtranslations.cmake @@ -1,4 +1,8 @@ superbuild_add_project(paraviewtranslations + DEPENDS + qt + DEPENDS_OPTIONAL + qt5 qt6 LICENSE_FILES LICENSE SPDX_LICENSE_IDENTIFIER @@ -7,6 +11,5 @@ superbuild_add_project(paraviewtranslations "Copyright Kitware SAS" CMAKE_ARGS -DPARAVIEW_TRANSLATIONS_INSTALL_QT_TRANSLATIONS:BOOL=ON - DEPENDS - qt5 + -DPARAVIEW_TRANSLATIONS_QT_VERSION:STRING=${qt_version} ) diff --git a/projects/patches/medreader-pqTreeWidget-margins-api.patch b/projects/patches/medreader-pqTreeWidget-margins-api.patch new file mode 100644 index 0000000000000000000000000000000000000000..ee94d59b0e26910cc7c33215e69476975ec01d65 --- /dev/null +++ b/projects/patches/medreader-pqTreeWidget-margins-api.patch @@ -0,0 +1,19 @@ +diff -u -Nr -U5 paravis-10af712/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqAbstractFieldsWidget.cxx paravis-10af712.pqTreeWidget-margins-api/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqAbstractFieldsWidget.cxx +--- paravis-10af712/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqAbstractFieldsWidget.cxx 2023-06-05 08:03:34.000000000 +0200 ++++ paravis-10af712.pqTreeWidget-margins-api/src/Plugins/MEDReader/plugin/ParaViewPlugin/pqAbstractFieldsWidget.cxx 2025-02-07 15:51:51.570696598 +0100 +@@ -72,13 +72,12 @@ + //----------------------------------------------------------------------------- + QSize pqAbstractFieldsWidget::sizeHint() const + { + // TreeWidget sizeHintForRow is too low, correcting to +3. + int pix = (this->TreeWidget->sizeHintForRow(0) + 3) * this->NItems; +- int margin[4]; +- this->TreeWidget->getContentsMargins(margin, margin + 1, margin + 2, margin + 3); +- int h = pix + margin[1] + margin[3]; ++ QMargins margin = this->TreeWidget->contentsMargins(); ++ int h = pix + margin.top() + margin.bottom(); + if (this->visibleHeader) + { + h += this->TreeWidget->header()->frameSize().height(); + } + h = std::min(300, h); diff --git a/projects/unix/paraview.bundle.cmake b/projects/unix/paraview.bundle.cmake index 5f9f26f2390a8470bf39a2ff1310ae529b324d17..ed0c1d7422c01cb68925131ab101ea672730f7b5 100644 --- a/projects/unix/paraview.bundle.cmake +++ b/projects/unix/paraview.bundle.cmake @@ -38,6 +38,6 @@ if (paraviewweb_enabled) COMPONENT "${paraview_component}") endif () -if (qt5_ENABLE_WEBENGINE) +if (qt5_ENABLE_WEBENGINE OR qt6_ENABLE_WEBENGINE) message(WARNING "Packaging QtWebEngine on Linux is not supported yet, package may not be usable") endif () diff --git a/projects/unix/paraview.bundle.unix.cmake b/projects/unix/paraview.bundle.unix.cmake index b31ef00ff6a1eba0fa7f5fde736b09c95db18be0..60851ba66e8f0c647b3cc5ae5a0de9f4f00758c4 100644 --- a/projects/unix/paraview.bundle.unix.cmake +++ b/projects/unix/paraview.bundle.unix.cmake @@ -6,6 +6,11 @@ if (Qt5_DIR) "${Qt5_DIR}/../..") endif () +if (Qt6_DIR) + list(APPEND library_paths + "${Qt6_DIR}/../..") +endif () + set(include_regexes) if (fortran_enabled) list(APPEND include_regexes @@ -27,6 +32,11 @@ if (launchers_enabled AND mpi_built_by_superbuild) ".*/libmpicxx") endif() +if (Qt6_DIR) + list(APPEND exclude_regexes + "libxcb-cursor.so.0") +endif () + foreach (executable IN LISTS paraview_executables) superbuild_unix_install_program("${superbuild_install_location}/bin/${executable}" "lib" @@ -306,7 +316,8 @@ elseif (catalyst_enabled) endforeach () endif () -if (qt5_enabled AND qt5_plugin_paths) +if ((qt5_enabled AND qt5_plugin_paths) OR + (qt6_enabled AND qt6_plugin_paths)) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" "[Paths]\nPrefix = ..\n") install( FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" @@ -328,6 +339,18 @@ foreach (qt5_plugin_path IN LISTS qt5_plugin_paths) EXCLUDE_REGEXES ${exclude_regexes}) endforeach () +foreach (qt6_plugin_path IN LISTS qt6_plugin_paths) + get_filename_component(qt6_plugin_group "${qt6_plugin_path}" DIRECTORY) + get_filename_component(qt6_plugin_group "${qt6_plugin_group}" NAME) + + superbuild_unix_install_module("${qt6_plugin_path}" + "lib" + "plugins/${qt6_plugin_group}/" + LOADER_PATHS "${library_paths}" + INCLUDE_REGEXES ${include_regexes} + EXCLUDE_REGEXES ${exclude_regexes}) +endforeach () + # install paraview plugins. # see discussion on paraview/paraview-superbuild!865 for why this delayed # until the end. diff --git a/projects/unix/paraviewsdk.cmake b/projects/unix/paraviewsdk.cmake index bde548c3a5c44a385fb61250b243731b65418172..4f648b666369d7ce6d8bfe0ce0e3904422cafedd 100644 --- a/projects/unix/paraviewsdk.cmake +++ b/projects/unix/paraviewsdk.cmake @@ -9,5 +9,6 @@ endfunction () if (paraviewsdk_enabled) paraviewsdk_check_system_usage(qt5) + paraviewsdk_check_system_usage(qt6) paraviewsdk_check_system_usage(mpi) endif () diff --git a/projects/vortexfinder2.cmake b/projects/vortexfinder2.cmake index 1e690e924b92de4298e6648116709681e6aeb74e..af9264970cd9a2d0dca324e8f3aa8e4e6b7bae3f 100644 --- a/projects/vortexfinder2.cmake +++ b/projects/vortexfinder2.cmake @@ -1,7 +1,7 @@ superbuild_add_project(vortexfinder2 DEPENDS paraview - # Note: lookingglass shouldnt' be needed when the remote module is added to VTK - DEPENDS_OPTIONAL qt5 lookingglass + # Note: lookingglass shouldn't be needed when the remote module is added to VTK + DEPENDS_OPTIONAL qt5 qt6 lookingglass LICENSE_FILES COPYING.md SPDX_LICENSE_IDENTIFIER diff --git a/projects/win32/paraview.bundle.cmake b/projects/win32/paraview.bundle.cmake index 9de570f11d72724a19053fb55113f82fce49a1e6..34f68cd358b7d41064d713f6574df57a574fe6d2 100644 --- a/projects/win32/paraview.bundle.cmake +++ b/projects/win32/paraview.bundle.cmake @@ -46,6 +46,11 @@ if (Qt5_DIR) "${Qt5_DIR}/../../../bin") endif () +if (Qt6_DIR) + list(APPEND library_paths + "${Qt6_DIR}/../../../bin") +endif () + set(exclude_regexes) if (python3_enabled) if (python3_built_by_superbuild) @@ -294,6 +299,39 @@ if (qt5_enabled) endif() endif () +foreach (qt6_plugin_path IN LISTS qt6_plugin_paths) + get_filename_component(qt6_plugin_group "${qt6_plugin_path}" DIRECTORY) + get_filename_component(qt6_plugin_group "${qt6_plugin_group}" NAME) + + superbuild_windows_install_plugin( + "${qt6_plugin_path}" + "bin" + "bin/${qt6_plugin_group}" + SEARCH_DIRECTORIES "${library_paths}") +endforeach () + +if (qt6_enabled) + set(qt6_root_dir "${Qt6_DIR}/../../..") + + if (qt6_ENABLE_WEBENGINE) + _superbuild_windows_install_executable( + "${qt6_root_dir}/bin/QtWebEngineProcess.exe" + "bin" + SEARCH_DIRECTORIES "${library_paths}" + EXCLUDE_REGEXES ${exclude_regexes}) + + install( + DIRECTORY "${qt6_root_dir}/resources" + DESTINATION "." + COMPONENT superbuild) + + install( + FILES "${qt6_root_dir}/bin/qt.conf" + DESTINATION "bin" + COMPONENT superbuild) + endif() +endif () + if (catalyst_enabled) set(adaptors "paraview" diff --git a/projects/win32/patches/threedxwaresdk-windows-include.patch b/projects/win32/patches/threedxwaresdk-windows-include.patch new file mode 100644 index 0000000000000000000000000000000000000000..1492ac2b79fd2385d8b6d3ec8c80e8fc03b57f83 --- /dev/null +++ b/projects/win32/patches/threedxwaresdk-windows-include.patch @@ -0,0 +1,42 @@ +diff -u -Nr -U5 3dx/samples/navlib_viewer/src/SpaceMouse/CCommandTreeNode.hpp 3dx.windows-include/samples/navlib_viewer/src/SpaceMouse/CCommandTreeNode.hpp +--- 3dx/samples/navlib_viewer/src/SpaceMouse/CCommandTreeNode.hpp 2020-05-27 15:49:36.000000000 +0200 ++++ 3dx.windows-include/samples/navlib_viewer/src/SpaceMouse/CCommandTreeNode.hpp 2025-02-18 22:17:57.432647925 +0100 +@@ -21,10 +21,11 @@ + + // stdlib + #include + #include + #include ++#include + + namespace TDx { + template class raw_linkedlist_iterator { + public: + typedef std::input_iterator_tag iterator_category; +@@ -275,6 +276,6 @@ + }; + + typedef CCommandTree CCommandTreeNode; + } // namespace TDx + +-#endif // CCommandTreeNode_HPP_INCLUDED +\ No newline at end of file ++#endif // CCommandTreeNode_HPP_INCLUDED +diff -u -Nr -U5 3dx/samples/navlib_viewer/src/SpaceMouse/CImage.hpp 3dx.windows-include/samples/navlib_viewer/src/SpaceMouse/CImage.hpp +--- 3dx/samples/navlib_viewer/src/SpaceMouse/CImage.hpp 2019-07-26 09:42:52.000000000 +0200 ++++ 3dx.windows-include/samples/navlib_viewer/src/SpaceMouse/CImage.hpp 2025-02-18 20:05:45.988667637 +0100 +@@ -31,10 +31,14 @@ + #if _MSC_VER < 1700 + #pragma warning(disable : 4482) // warning C4482: nonstandard extension used + #endif + #endif + ++#ifdef _WIN32 ++#include ++#endif ++ + #ifdef __APPLE__ + #define IS_INTRESOURCE(x) false + #endif + + namespace TDx { diff --git a/projects/win32/threedxwaresdk.cmake b/projects/win32/threedxwaresdk.cmake index 8bc3d606d04bf6b17a2c76b92f43d675b11dd637..ae632bc3d94f0315ac4807877eb0b3c83e9c0320 100644 --- a/projects/win32/threedxwaresdk.cmake +++ b/projects/win32/threedxwaresdk.cmake @@ -22,6 +22,9 @@ superbuild_add_project(threedxwaresdk "${CMAKE_CURRENT_LIST_DIR}/scripts/threedxwaresdk.install.cmake" ) +superbuild_apply_patch(threedxwaresdk windows-include + "Add missing Windows include") + superbuild_add_extra_cmake_args( -D3DxWareSDK_ROOT:PATH= ) diff --git a/superbuild b/superbuild index dc163e1ef025113e044c6ab7865626f5e750be64..f4c571f3ef73818ae16dcd52b9a2f3bfe4ddfee7 160000 --- a/superbuild +++ b/superbuild @@ -1 +1 @@ -Subproject commit dc163e1ef025113e044c6ab7865626f5e750be64 +Subproject commit f4c571f3ef73818ae16dcd52b9a2f3bfe4ddfee7 diff --git a/tests/paraview.test.cmake b/tests/paraview.test.cmake index 81a331eddca15f7fc0472e0c3e637dd6a5d62387..6f26a713111eb59942d1bbad31c371a8df167caa 100644 --- a/tests/paraview.test.cmake +++ b/tests/paraview.test.cmake @@ -66,7 +66,7 @@ if (UNIX AND NOT APPLE) ) endif () -if (NOT qt5_enabled) +if (NOT qt5_enabled AND NOT qt6_enabled) set(paraview_exe) endif () @@ -157,10 +157,16 @@ endfunction () if (python3_enabled) # Simple test to launch the application and load all plugins. - paraview_add_ui_test("testui" "TestUI") + if (qt5_enabled) + paraview_add_ui_test("testui" "TestUI-qt5") + elseif (qt6_enabled) + paraview_add_ui_test("testui" "TestUI-qt6") + endif () - paraview_add_ui_test("finddata" "TestFindData" - "--test-baseline=${CMAKE_CURRENT_LIST_DIR}/baselines/Superbuild-TestFindData.png") + if (numpy_enabled) + paraview_add_ui_test("finddata" "TestFindData" + "--test-baseline=${CMAKE_CURRENT_LIST_DIR}/baselines/Superbuild-TestFindData.png") + endif () paraview_add_test("pvpython-help" "${pvpython_exe}" -c "help()") diff --git a/tests/paraviewsdk.test.cmake b/tests/paraviewsdk.test.cmake index e6ce0e7f7d216beeef92b7577c2c67b433775dc4..a5c9ae34c75edd647726c7a2307a2e5953db3924 100644 --- a/tests/paraviewsdk.test.cmake +++ b/tests/paraviewsdk.test.cmake @@ -56,7 +56,7 @@ function (add_paraviewsdk_example_plugin_test name) endfunction () set(gui_enabled FALSE) -if (qt5_enabled) +if (qt5_enabled OR qt6_enabled) set(gui_enabled TRUE) endif () diff --git a/tests/xml/TestUI.xml b/tests/xml/TestUI-qt5.xml similarity index 96% rename from tests/xml/TestUI.xml rename to tests/xml/TestUI-qt5.xml index 8db746b97402d6ee04cebcde477009f8b537c5e9..4a4359ea5ebce3328f95c7bd4bff415c6bdf23a1 100644 --- a/tests/xml/TestUI.xml +++ b/tests/xml/TestUI-qt5.xml @@ -15,7 +15,7 @@ - + diff --git a/tests/xml/TestUI-qt6.xml b/tests/xml/TestUI-qt6.xml new file mode 100644 index 0000000000000000000000000000000000000000..4a4359ea5ebce3328f95c7bd4bff415c6bdf23a1 --- /dev/null +++ b/tests/xml/TestUI-qt6.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +