From 6979a63396fdedfac7f5e1c00ff1710f92d15f70 Mon Sep 17 00:00:00 2001 From: Cyrus Harrison Date: Wed, 8 Sep 2021 15:53:47 -0700 Subject: conduit: changes related to hdf5 builds that use cmake (#25719) --- var/spack/repos/builtin/packages/conduit/package.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'var') 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") -- cgit v1.2.3-70-g09d2