diff options
| author | Cyrus Harrison <cyrush@llnl.gov> | 2021-09-08 15:53:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-08 15:53:47 -0700 |
| commit | 6979a63396fdedfac7f5e1c00ff1710f92d15f70 (patch) | |
| tree | 565066ba3015d28d5709f9e55bc4d35caf84a890 /var | |
| parent | f9314d38b0bec2df16e58312fad0cbb01fad7696 (diff) | |
| download | spack-6979a63396fdedfac7f5e1c00ff1710f92d15f70.tar.gz spack-6979a63396fdedfac7f5e1c00ff1710f92d15f70.tar.bz2 spack-6979a63396fdedfac7f5e1c00ff1710f92d15f70.tar.xz spack-6979a63396fdedfac7f5e1c00ff1710f92d15f70.zip | |
conduit: changes related to hdf5 builds that use cmake (#25719)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/conduit/package.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index d8fa4fa259..67d3256be8 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -121,6 +121,9 @@ class Conduit(CMakePackage): depends_on("hdf5@1.8.19:1.8.999~shared~cxx", when="+hdf5+hdf5_compat~shared") depends_on("hdf5~cxx", when="+hdf5~hdf5_compat+shared") depends_on("hdf5~shared~cxx", when="+hdf5~hdf5_compat~shared") + # we need to hand this to conduit so it can properly + # handle downstream linking of zlib reqed by hdf5 + depends_on("zlib", when="+hdf5") ############### # Silo @@ -514,6 +517,7 @@ class Conduit(CMakePackage): if "+hdf5" in spec: cfg.write(cmake_cache_entry("HDF5_DIR", spec['hdf5'].prefix)) + cfg.write(cmake_cache_entry("ZLIB_DIR", spec['zlib'].prefix)) else: cfg.write("# hdf5 not built by spack \n") |