From 752b72c304175ef7a815c3803d19e580492202e1 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 18 Jul 2024 11:11:38 -0500 Subject: [PATCH] paraview: support Qt6 for 5.12 and newer --- var/spack/repos/builtin/packages/paraview/package.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index e40636e7728..db6f3086a62 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -231,11 +231,16 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): depends_on("mpi", when="+mpi") conflicts("mpi", when="~mpi") + depends_on("qmake", when="@5.12.0:+qt") + depends_on("qt", when="@5.3.0:5.11+qt") + with when("^[virtuals=qmake] qt-base"): + depends_on("qt-base+opengl", when="+opengl2") + depends_on("qt-base~opengl", when="~opengl2") + with when("^[virtuals=qmake] qt"): + depends_on("qt+opengl", when="+opengl2") + depends_on("qt~opengl", when="~opengl2") 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("gl@3.2:", when="+opengl2") depends_on("gl@1.2:", when="~opengl2")