forked from spack/spack
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
geant4: support Qt5 and Qt6 (spack#45352)
* geant4: support qt5 and qt6 * geant4: update conflict msg
- Loading branch information
1 parent
9402974
commit 66c0804
Showing
1 changed file
with
10 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -166,8 +166,13 @@ def std_when(values): | |
depends_on("libxmu", when="+x11") | ||
depends_on("motif", when="+motif") | ||
with when("+qt"): | ||
depends_on("qt@5: +opengl") | ||
depends_on("[email protected]:", 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("[email protected]:", 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 @@ def cmake_args(self): | |
|
||
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")) | ||
|
||
|