diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2015-12-07 16:46:15 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2015-12-07 16:46:15 -0800 |
| commit | b0434fa4864c6469b48cd81c96eb7fba279e549d (patch) | |
| tree | 67235f0cfc81d6b3e0a31b10168df8417bc8093c | |
| parent | fcabf0ef0dc04a990251b266a66a3bf2d50a0185 (diff) | |
| parent | 36272c813675c98864e7b9eda50e99ea800dfe21 (diff) | |
| download | spack-b0434fa4864c6469b48cd81c96eb7fba279e549d.tar.gz spack-b0434fa4864c6469b48cd81c96eb7fba279e549d.tar.bz2 spack-b0434fa4864c6469b48cd81c96eb7fba279e549d.tar.xz spack-b0434fa4864c6469b48cd81c96eb7fba279e549d.zip | |
Merge pull request #221 from davidbeckingsale/features/cleverleaf-boost
Update CleverLeaf package to use Boost and fix SAMRAI MPI usage
| -rw-r--r-- | var/spack/packages/SAMRAI/package.py | 5 | ||||
| -rw-r--r-- | var/spack/packages/cleverleaf/package.py | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/var/spack/packages/SAMRAI/package.py b/var/spack/packages/SAMRAI/package.py index 5ee90cf400..a17aea9c99 100644 --- a/var/spack/packages/SAMRAI/package.py +++ b/var/spack/packages/SAMRAI/package.py @@ -33,11 +33,10 @@ class Samrai(Package): # TODO: currently hard-coded to use openmpi - be careful! def install(self, spec, prefix): - mpi = next(m for m in ('openmpi', 'mpich', 'mvapich') - if m in spec) - configure( "--prefix=%s" % prefix, + "--with-CXX=%s" % spec['mpi'].prefix.bin + "/mpic++", + "--with-CC=%s" % spec['mpi'].prefix.bin + "/mpicc", "--with-hdf5=%s" % spec['hdf5'].prefix, "--with-boost=%s" % spec['boost'].prefix, "--with-zlib=%s" % spec['zlib'].prefix, diff --git a/var/spack/packages/cleverleaf/package.py b/var/spack/packages/cleverleaf/package.py index ddbe57f019..4e7e6a855a 100644 --- a/var/spack/packages/cleverleaf/package.py +++ b/var/spack/packages/cleverleaf/package.py @@ -13,7 +13,9 @@ class Cleverleaf(Package): version('develop', git='https://github.com/UK-MAC/CleverLeaf_ref.git', branch='develop') - depends_on("SAMRAI@3.8.0") + depends_on("SAMRAI@3.8.0:") + depends_on("hdf5") + depends_on("boost") def install(self, spec, prefix): cmake(*std_cmake_args) |