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

VTK: fix 9.1–9.2 builds (#34589)

Browse Source 
* VTK: add missing dependencies

* Deal with missing verdict dep

* http -> https

* Add patch to fix failing cmake

* Update netcdf-cxx usage in build recipe

* netcdf-cxx4 doesn't work
This commit is contained in:
Adam J. Stewart 2023-01-18 16:29:29 -07:00 committed by GitHub
parent 08101639cd
commit d0f5a62a7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
var/spack/repos/builtin/packages/vtk/package.py
View File

@ -15,19 +15,15 @@ class Vtk(CMakePackage):
available software system for 3D computer graphics, image
processing and visualization."""
homepage = "http://www.vtk.org"
homepage = "https://www.vtk.org"
url = "https://www.vtk.org/files/release/9.0/VTK-9.0.0.tar.gz"
list_url = "http://www.vtk.org/download/"
list_url = "https://www.vtk.org/download/"
maintainers = ["chuckatkins", "danlipsa"]
version("9.2.2", sha256="1c5b0a2be71fac96ff4831af69e350f7a0ea3168981f790c000709dcf9121075")
version("9.1.0", sha256="8fed42f4f8f1eb8083107b68eaa9ad71da07110161a3116ad807f43e5ca5ce96")
version(
"9.0.3",
sha256="bc3eb9625b2b8dbfecb6052a2ab091fc91405de4333b0ec68f3323815154ed8a",
preferred=True,
)
version("9.0.3", sha256="bc3eb9625b2b8dbfecb6052a2ab091fc91405de4333b0ec68f3323815154ed8a")
version("9.0.1", sha256="1b39a5e191c282861e7af4101eaa8585969a2de05f5646c9199a161213a622c7")
version("9.0.0", sha256="15def4e6f84d72f82386617fe595ec124dda3cbd13ea19a0dcd91583197d8715")
version("8.2.0", sha256="34c3dc775261be5e45a8049155f7228b6bd668106c72a3c435d95730d17d57bb")
@ -148,6 +144,7 @@ class Vtk(CMakePackage):
depends_on("cgns@4.1.1:~mpi", when="@9.1: ~mpi")
depends_on("seacas@2021-05-12:+mpi", when="@9.1: +mpi")
depends_on("seacas@2021-05-12:~mpi", when="@9.1: ~mpi")
depends_on("nlohmann-json", when="@9.2:")
# For finding Fujitsu-MPI wrapper commands
patch("find_fujitsu_mpi.patch", when="@:8.2.0%fj")
@ -160,6 +157,12 @@ class Vtk(CMakePackage):
when="@:9.0.1 ^freetype@2.10.3:",
)
patch(
"https://gitlab.kitware.com/vtk/vtk/-/commit/5a1c96e12e9b4a660d326be3bed115a2ceadb573.patch",
sha256="65175731c080961f85d779d613ac1f6bce89783745e54e864edec7637b03b18a",
when="@9.1",
)
def url_for_version(self, version):
url = "http://www.vtk.org/files/release/{0}/VTK-{1}.tar.gz"
return url.format(version.up_to(2), version)
@ -226,6 +229,8 @@ def cmake_args(self):
"-DVTK_MODULE_USE_EXTERNAL_VTK_fmt:BOOL=OFF",
]
)
if spec.satisfies("@9.2:"):
cmake_args.append("-DVTK_MODULE_USE_EXTERNAL_VTK_verdict:BOOL=OFF")
# Some variable names have changed
if spec.satisfies("@8.2.0"):