paraview: fix typo

paraview: reorg when +qt dependencies to avoid pulling also qt5 when qt6 desired
paraview: qt-tools +assistant
2025-03-20 16:07:43 -05:00 · 2025-03-20 16:07:43 -05:00 · 2025-03-20 16:07:43 -05:00 · 2025-03-20 16:07:43 -05:00 · 2025-03-20 16:07:43 -05:00 · 2025-03-20 16:07:43 -05:00
2 changed files with 17 additions and 6 deletions
--- a/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml
@ -36,7 +36,8 @@ spack:
  - paraview_specs:
    - matrix:
      - - paraview +raytracing +adios2 +fides
-      - - +qt ^[virtuals=gl] glx # GUI Support w/ GLX Rendering
+      - - +qt ^[virtuals=gl] glx ^[virtuals=qmake] qt-base # Qt6 GUI Support w/ GLX Rendering
+        - +qt ^[virtuals=gl] glx ^[virtuals=qmake] qt # Qt5 GUI Support w/ GLX Rendering
        - ~qt ^[virtuals=gl] glx # GLX Rendering
        - ^[virtuals=gl] osmesa # OSMesa Rendering
  - visit_specs:
--- a/var/spack/repos/builtin/packages/paraview/package.py
+++ b/var/spack/repos/builtin/packages/paraview/package.py
@ -231,11 +231,21 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage):
    depends_on("mpi", when="+mpi")
    conflicts("mpi", when="~mpi")

-    depends_on("qt@:4", when="@:5.2.0+qt")
-    depends_on("qt+sql", when="+qt")
    with when("+qt"):
-        depends_on("qt+opengl", when="@5.3.0:+opengl2")
-        depends_on("qt~opengl", when="@5.3.0:~opengl2")
+        depends_on("qmake", when="@5.12.0:")
+        depends_on("qt", when="@5.3.0:5.11")
+        depends_on("qt@:4", when="@:5.2.0")
+    with when("^[virtuals=qmake] qt-base"):
+        depends_on("qt-base+gui+network+widgets")
+        depends_on("qt-base+opengl", when="+opengl2")
+        depends_on("qt-base~opengl", when="~opengl2")
+        depends_on("qt-tools +assistant")  # Qt::Help
+        depends_on("qt-5compat")
+        depends_on("qt-svg")
+    with when("^[virtuals=qmake] qt"):
+        depends_on("qt+sql")
+        depends_on("qt+opengl", when="+opengl2")
+        depends_on("qt~opengl", when="~opengl2")

    depends_on("gl@3.2:", when="+opengl2")
    depends_on("gl@1.2:", when="~opengl2")
@ -604,7 +614,7 @@ def use_x11():
        # The assumed qt version changed to QT5 (as of paraview 5.2.1),
        # so explicitly specify which QT major version is actually being used
        if spec.satisfies("+qt"):
-            cmake_args.extend(["-DPARAVIEW_QT_VERSION=%s" % spec["qt"].version[0]])
+            cmake_args.extend(["-DPARAVIEW_QT_VERSION=%s" % spec["qmake"].version[0]])
            if IS_WINDOWS:
                # Windows does not currently support Qt Quick
                cmake_args.append("-DVTK_MODULE_ENABLE_VTK_GUISupportQtQuick:STRING=NO")
Author	SHA1	Message	Date
Wouter Deconinck	559cda89b7	paraview: fix typo	2025-03-20 16:07:43 -05:00
Wouter Deconinck	ff74147107	paraview: reorg when +qt dependencies to avoid pulling also qt5 when qt6 desired	2025-03-20 16:07:43 -05:00
Wouter Deconinck	7547d8a91e	paraview: qt-tools +assistant	2025-03-20 16:07:43 -05:00
Wouter Deconinck	d394e54925	paraview: depends_on qt-svg	2025-03-20 16:07:43 -05:00
Wouter Deconinck	5f467bb577	data-vis-sdk: paraview ~qt needs no ^[virtuals=qmake] qt	2025-03-20 16:07:43 -05:00
Wouter Deconinck	716639bbdd	Revert "data-vis-sdk: when ecp-data-vis-sdk ~visit, don't pull visit through sensei" This reverts commit 8f3b90619dc2bb5900ee2526927ac6d1c0ff7738.	2025-03-20 16:07:43 -05:00
Wouter Deconinck	16d8a210b3	data-vis-sdk: when ecp-data-vis-sdk ~visit, don't pull visit through sensei	2025-03-20 16:07:43 -05:00
Wouter Deconinck	b6783bbfa1	paraview: depends_on qt-5compat	2025-03-20 16:07:43 -05:00
Wouter Deconinck	962829f72e	paraview: depends_on qt-base+gui+network+widgets	2025-03-20 16:07:43 -05:00
Wouter Deconinck	31ff80ddca	paraview: set PARAVIEW_QT_VERSION based on qmake	2025-03-20 16:07:43 -05:00
Wouter Deconinck	396785477c	data-vis-sdk: build paraview with both Qt5 and Qt6	2025-03-20 16:07:43 -05:00
Wouter Deconinck	752b72c304	paraview: support Qt6 for 5.12 and newer	2025-03-20 16:07:43 -05:00