zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

geant4: support Qt5 and Qt6 (#45352)

Browse Source 
* geant4: support qt5 and qt6
* geant4: update conflict msg
This commit is contained in:
Wouter Deconinck 2024-07-22 07:38:46 -05:00 committed by GitHub
parent 0d04223ccd
commit 8b45fa089e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
var/spack/repos/builtin/packages/geant4/package.py
View File

@ -166,8 +166,13 @@ def std_when(values):
depends_on("libxmu", when="+x11") depends_on("libxmu", when="+x11")
depends_on("motif", when="+motif") depends_on("motif", when="+motif")
with when("+qt"): with when("+qt"):
depends_on("qt@5: +opengl") depends_on("qmake")
depends_on("qt@5.9:", when="@11.2:") 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 # As released, 10.0.4 has inconsistently capitalised filenames
# in the cmake files; this patch also enables cxxstd 14 # in the cmake files; this patch also enables cxxstd 14
@ -307,7 +312,9 @@ def cmake_args(self):
if "+qt" in spec: if "+qt" in spec:
options.append(self.define("GEANT4_USE_QT", True)) 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")) options.append(self.define_from_variant("GEANT4_USE_VTK", "vtk"))