From 29d5dc514b107c92013f1aa403584fbeaaecdb24 Mon Sep 17 00:00:00 2001
From: Cyrus Harrison <cyrush@llnl.gov>
Date: Sat, 29 Jun 2019 06:41:40 -0700
Subject: [PATCH] try to avoid issue with needing both cmake and makefile req
 vers of zfp

---
 .travis.yml                                           | 1 -
 scripts/uberenv/packages/conduit/package.py           | 4 ++--
 scripts/uberenv/packages/{zfp => zfpcmake}/package.py | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)
 rename scripts/uberenv/packages/{zfp => zfpcmake}/package.py (97%)

diff --git a/.travis.yml b/.travis.yml
index 8780e1784..ccb1e1120 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -169,7 +169,6 @@ script:
   - export SPACK_SPEC="${SPACK_SPEC} ^cmake@${CMAKE_VERSION}"
   - export SPACK_SPEC="${SPACK_SPEC} ^python@${PYTHON_VERSION}"
   - if [ $ENABLE_SILO = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ^silo~mpi"; fi
-  - if [ $ENABLE_ADIOS = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC} ^adios~zfp"; fi
   - echo $SPACK_SPEC
   # Output something every 10 minutes or Travis kills the job
   - while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done &
diff --git a/scripts/uberenv/packages/conduit/package.py b/scripts/uberenv/packages/conduit/package.py
index d87b9d6ba..65fc70e81 100644
--- a/scripts/uberenv/packages/conduit/package.py
+++ b/scripts/uberenv/packages/conduit/package.py
@@ -116,7 +116,7 @@ class Conduit(Package):
     depends_on("adios~mpi~hdf5~shared~blosc", when="+adios~mpi~shared")
 
     # zfp
-    depends_on("zfp", when="+zfp")
+    depends_on("zfpcmake", when="+zfp")
 
     #######################
     # MPI
@@ -441,7 +441,7 @@ def create_host_config(self, spec, prefix, py_site_pkgs_dir=None):
         cfg.write("# zfp from spack \n")
 
         if "+zfp" in spec:
-            cfg.write(cmake_cache_entry("ZFP_DIR", spec['zfp'].prefix))
+            cfg.write(cmake_cache_entry("ZFP_DIR", spec['zfpcmake'].prefix))
         else:
             cfg.write("# zfp not built by spack \n")
 
diff --git a/scripts/uberenv/packages/zfp/package.py b/scripts/uberenv/packages/zfpcmake/package.py
similarity index 97%
rename from scripts/uberenv/packages/zfp/package.py
rename to scripts/uberenv/packages/zfpcmake/package.py
index 7675680e7..9ab231270 100644
--- a/scripts/uberenv/packages/zfp/package.py
+++ b/scripts/uberenv/packages/zfpcmake/package.py
@@ -6,7 +6,7 @@
 from spack import *
 
 
-class Zfp(CMakePackage):
+class Zfpcmake(CMakePackage):
     """zfp is an open source C/C++ library for high-fidelity, high-throughput
        lossy compression of floating-point and integer multi-dimensional
        arrays.