summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorChuck Atkins <chuck.atkins@kitware.com>2022-05-12 15:16:57 -0400
committerGitHub <noreply@github.com>2022-05-12 21:16:57 +0200
commitf11572166f74f5c9073f499118b181638fe167b7 (patch)
tree41f84b7a84bdd4281a3a4bc2013e9e2c1859e059 /var
parentaa6665d5ee6a906bd684a215c9606fe715c6e7c8 (diff)
downloadspack-f11572166f74f5c9073f499118b181638fe167b7.tar.gz
spack-f11572166f74f5c9073f499118b181638fe167b7.tar.bz2
spack-f11572166f74f5c9073f499118b181638fe167b7.tar.xz
spack-f11572166f74f5c9073f499118b181638fe167b7.zip
vtk: fix hdf5 version specification (#30592)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/vtk/package.py14
1 files changed, 12 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py
index 5d34c11d76..0a5fcc0551 100644
--- a/var/spack/repos/builtin/packages/vtk/package.py
+++ b/var/spack/repos/builtin/packages/vtk/package.py
@@ -114,8 +114,9 @@ class Vtk(CMakePackage):
depends_on('freetype @:2.10.2', when='@:9.0.1')
depends_on('freetype')
depends_on('glew')
- # set hl variant explicitly, similar to issue #7145
- depends_on('hdf5+hl')
+ depends_on('hdf5~mpi', when='~mpi')
+ depends_on('hdf5+mpi', when='+mpi')
+ depends_on('hdf5@1.8:', when='@8:9.0')
depends_on('hdf5@1.10:', when='@9.1:')
depends_on('jpeg')
depends_on('jsoncpp')
@@ -161,6 +162,15 @@ class Vtk(CMakePackage):
# the environment
env.set('FREETYPE_DIR', self.spec['freetype'].prefix)
+ # Force API compatibility with HDF5
+ if '+hdf5' in self.spec:
+ if '@9.1:' in self.spec:
+ env.append_flags('CFLAGS', '-DH5_USE_110_API')
+ env.append_flags('CXXFLAGS', '-DH5_USE_110_API')
+ elif '@8:' in self.spec:
+ env.append_flags('CFLAGS', '-DH5_USE_18_API')
+ env.append_flags('CXXFLAGS', '-DH5_USE_18_API')
+
def cmake_args(self):
spec = self.spec