From f11572166f74f5c9073f499118b181638fe167b7 Mon Sep 17 00:00:00 2001 From: Chuck Atkins Date: Thu, 12 May 2022 15:16:57 -0400 Subject: vtk: fix hdf5 version specification (#30592) --- var/spack/repos/builtin/packages/vtk/package.py | 14 ++++++++++++-- 1 file 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 -- cgit v1.2.3-70-g09d2