diff options
| author | Harmen Stoppels <me@harmenstoppels.nl> | 2024-08-30 12:57:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-30 12:57:16 +0200 |
| commit | dd756d53deca7dff02c80a64a7e5b2c4147ca785 (patch) | |
| tree | 350a85c71e030bde06b615f7ea16899a44850274 /var | |
| parent | 1c1970e7277440069c0050ebaf6720f72dcdf2e5 (diff) | |
| download | spack-dd756d53deca7dff02c80a64a7e5b2c4147ca785.tar.gz spack-dd756d53deca7dff02c80a64a7e5b2c4147ca785.tar.bz2 spack-dd756d53deca7dff02c80a64a7e5b2c4147ca785.tar.xz spack-dd756d53deca7dff02c80a64a7e5b2c4147ca785.zip | |
windows-vis: fix failing pipeline (#46135)
* seacas: fix gnu parallel dep
* add vtk@9.0 platform=windows conflict
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/seacas/package.py | 10 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/vtk/package.py | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/seacas/package.py b/var/spack/repos/builtin/packages/seacas/package.py index 43a1e010a5..3927a194dd 100644 --- a/var/spack/repos/builtin/packages/seacas/package.py +++ b/var/spack/repos/builtin/packages/seacas/package.py @@ -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 @@ class Seacas(CMakePackage): 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) diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index d141c6c83f..d2da1fe43e 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -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 |