diff options
| author | Wouter Deconinck <wdconinc@gmail.com> | 2024-07-22 07:38:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-22 13:38:46 +0100 |
| commit | 8b45fa089e24c6ab7de2eaf614977369e69daa54 (patch) | |
| tree | b0d986eb4f6a8454bb39d9e593678ee2de502910 | |
| parent | 0d04223ccdae43e606d7022fb59eb700c7bb896c (diff) | |
| download | spack-8b45fa089e24c6ab7de2eaf614977369e69daa54.tar.gz spack-8b45fa089e24c6ab7de2eaf614977369e69daa54.tar.bz2 spack-8b45fa089e24c6ab7de2eaf614977369e69daa54.tar.xz spack-8b45fa089e24c6ab7de2eaf614977369e69daa54.zip | |
geant4: support Qt5 and Qt6 (#45352)
* geant4: support qt5 and qt6
* geant4: update conflict msg
| -rw-r--r-- | var/spack/repos/builtin/packages/geant4/package.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/geant4/package.py b/var/spack/repos/builtin/packages/geant4/package.py index a894a47f58..2de7ab7b86 100644 --- a/var/spack/repos/builtin/packages/geant4/package.py +++ b/var/spack/repos/builtin/packages/geant4/package.py @@ -166,8 +166,13 @@ class Geant4(CMakePackage): depends_on("libxmu", when="+x11") depends_on("motif", when="+motif") with when("+qt"): - depends_on("qt@5: +opengl") - depends_on("qt@5.9:", when="@11.2:") + depends_on("qmake") + with when("^[virtuals=qmake] qt-base"): + depends_on("qt-base +accessibility +gui +opengl") + with when("^[virtuals=qmake] qt"): + depends_on("qt@5: +opengl") + depends_on("qt@5.9:", when="@11.2:") + conflicts("@:11.1 ^[virtuals=qmake] qt-base", msg="Qt6 not supported before 11.2") # As released, 10.0.4 has inconsistently capitalised filenames # in the cmake files; this patch also enables cxxstd 14 @@ -307,7 +312,9 @@ class Geant4(CMakePackage): if "+qt" in spec: options.append(self.define("GEANT4_USE_QT", True)) - options.append(self.define("QT_QMAKE_EXECUTABLE", spec["qt"].prefix.bin.qmake)) + if "^[virtuals=qmake] qt-base" in spec: + options.append(self.define("GEANT4_USE_QT_QT6", True)) + options.append(self.define("QT_QMAKE_EXECUTABLE", spec["qmake"].prefix.bin.qmake)) options.append(self.define_from_variant("GEANT4_USE_VTK", "vtk")) |