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

windows-vis: fix failing pipeline (#46135)

Browse Source 
* seacas: fix gnu parallel dep

* add vtk@9.0 platform=windows conflict
This commit is contained in:
Harmen Stoppels 2024-08-30 12:57:16 +02:00 committed by GitHub
parent 1c1970e727
commit dd756d53de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
var/spack/repos/builtin/packages/seacas/package.py
View File

@ -231,7 +231,9 @@ class Seacas(CMakePackage):
depends_on("cmake@3.17:", when="@:2023-05-30", type="build")
depends_on("mpi", when="+mpi")
depends_on("zlib-api", when="+zlib")
depends_on("parallel")
depends_on("parallel", when="platform=linux", type="run")
depends_on("parallel", when="platform=darwin", type="run")
depends_on("parallel", when="platform=freebsd", type="run")
depends_on("trilinos~exodus+mpi+pamgen", when="+mpi+pamgen")
depends_on("trilinos~exodus~mpi+pamgen", when="~mpi+pamgen")
# Always depends on netcdf-c
@ -487,3 +489,9 @@ def cmake_args(self):
options.append(define("CMAKE_INSTALL_NAME_DIR", self.prefix.lib))
return options
@run_after("install")
def symlink_parallel(self):
if not self.spec.dependencies("parallel"):
return
symlink(self.spec["parallel"].prefix.bin.parallel, self.prefix.bin.parallel)

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

@ -142,6 +142,10 @@ class Vtk(CMakePackage):
# a patch with the same name is also applied to paraview
# the two patches are the same but for the path to the files they patch
patch("vtk_alias_hdf5.patch", when="@9:")
# VTK 9.0 on Windows uses dll instead of lib for hdf5-hl target, which fails linking. Can't
# be fixed by bumping CMake lower bound, because VTK vendors FindHDF5.cmake. Various other
# patches to FindHDF5.cmake are missing, so add conflict instead of a series of patches.
conflicts("@9.0 platform=windows")
depends_on("libxt", when="^[virtuals=gl] glx platform=linux")
# VTK will need Qt5OpenGL, and qt needs '-opengl' for that