Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions repos/spack_repo/builtin/packages/vtk/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,8 @@ class Vtk(CMakePackage):

license("BSD-3-Clause")

version(
"9.5.1",
sha256="14443661c7b095d05b4e376fb3f40613f173e34fc9d4658234e9ec1d624a618f",
preferred=True,
)
version("9.7.0", sha256="affdb7a15ec34ee0174407f911ab70b646c7af01161818bbab4e1160b7eff720")
version("9.5.1", sha256="14443661c7b095d05b4e376fb3f40613f173e34fc9d4658234e9ec1d624a618f")
version("9.5.0", sha256="04ae86246b9557c6b61afbc534a6df099244fbc8f3937f82e6bc0570953af87d")
version("9.4.1", sha256="c253b0c8d002aaf98871c6d0cb76afc4936c301b72358a08d5f3f72ef8bc4529")
version("9.3.1", sha256="8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8")
Expand Down Expand Up @@ -161,7 +158,9 @@ class Vtk(CMakePackage):
depends_on("libxt", when="^[virtuals=gl] glx platform=linux")

# VTK will need Qt5OpenGL, and qt needs '-opengl' for that
depends_on("qt+opengl", when="+qt")
depends_on("qt+opengl", when="@:9.6 +qt")
depends_on("qt-base+accessibility+gui+opengl+widgets+sql", when="@9.7: +qt")
depends_on("qt-declarative", when="@9.7: +qt")

depends_on("boost", when="io=xdmf")
depends_on("boost+mpi", when="io=xdmf +mpi")
Expand Down Expand Up @@ -427,6 +426,9 @@ def module_variant(feature, on="YES", off="NO"):
if "darwin" in spec.architecture:
cmake_args.extend(["-DCMAKE_MACOSX_RPATH=ON"])

if spec.satisfies("@9.7: +qt"):
cmake_args.append(self.define("VTK_QT_VERSION", "6"))

if "+qt" in spec:
# https://github.com/martijnkoopman/Qt-VTK-viewer/blob/master/doc/Build-VTK.md
# The content of the above link changes over time with versions.
Expand All @@ -453,7 +455,7 @@ def module_variant(feature, on="YES", off="NO"):
# NOTE: The following definitions are required in order to allow
# VTK to build with qt~webkit versions (see the documentation for
# more info: http://www.vtk.org/Wiki/VTK/Tutorials/QtSetup).
if "~webkit" in spec["qt"]:
if spec.satisfies("^qt~webkit"):
cmake_args.extend(
[
"-DVTK_GROUP_ENABLE_Qt:STRING=NO",
Expand Down
6 changes: 6 additions & 0 deletions stacks/data-vis-sdk/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ spack:
- - paraview
- - +qt
- ~qt
- vtk_specs:
- matrix:
- - vtk
- - +qt
- ~qt
- visit_specs:
- matrix:
- - visit
Expand Down Expand Up @@ -85,6 +90,7 @@ spack:
- ascent
- $paraview_specs
- $visit_specs
- $vtk_specs
- vtk-m

ci:
Expand Down
Loading