diff options
| author | Aaron Fisher <fisher47@llnl.gov> | 2017-11-10 18:49:17 -0800 |
|---|---|---|
| committer | Christoph Junghans <christoph.junghans@gmail.com> | 2017-11-10 19:49:17 -0700 |
| commit | af06ea0e748bf4dce52b235bdb89da47fd34613b (patch) | |
| tree | 92f209a788f5fbe3f24e1e2b5a2037300af068cf | |
| parent | e38f31e7735aafa6113e76ddac1fce2009e8abfc (diff) | |
| download | spack-af06ea0e748bf4dce52b235bdb89da47fd34613b.tar.gz spack-af06ea0e748bf4dce52b235bdb89da47fd34613b.tar.bz2 spack-af06ea0e748bf4dce52b235bdb89da47fd34613b.tar.xz spack-af06ea0e748bf4dce52b235bdb89da47fd34613b.zip | |
Fixed mfem mpi build issue. (#6254)
* Fixed mfem mpi build issue.
* Fixed a non-mpi build issue and switched to the latest official MFEM release.
| -rw-r--r-- | var/spack/repos/builtin/packages/mfem/package.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index 146f700287..3afbd4ca2f 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -51,16 +51,17 @@ class Mfem(Package): # If this quick verification procedure fails, additional discussion # will be required to verify the new version. - version('3.3.2-rc2', git='https://github.com/mfem/mfem', - tag='v3.3.2-rc2') + version('3.3.2', + '01a762a5d0a2bc59ce4e2f59009045a4', + url='https://goo.gl/Kd7Jk8', extension='.tar.gz', + preferred=True) version('laghos-v1.0', git='https://github.com/mfem/mfem', tag='laghos-v1.0') version('3.3', 'b17bd452593aada93dc0fee748fcfbbf4f04ce3e7d77fdd0341cc9103bcacd0b', - url='http://goo.gl/Vrpsns', extension='.tar.gz', - preferred=True) + url='http://goo.gl/Vrpsns', extension='.tar.gz') version('3.2', '2938c3deed4ec4f7fd5b5f5cfe656845282e86e2dcd477d292390058b7b94340', @@ -160,6 +161,7 @@ class Mfem(Package): 'PREFIX=%s' % prefix, 'MFEM_USE_MEMALLOC=YES', 'MFEM_DEBUG=%s' % yes_no('+debug'), + 'CXX=%s' % env['CXX'], 'MFEM_USE_LIBUNWIND=%s' % yes_no('+debug'), 'MFEM_USE_GZSTREAM=%s' % yes_no('+gzstream'), 'MFEM_USE_METIS_5=%s' % metis5_str, @@ -174,6 +176,9 @@ class Mfem(Package): 'MFEM_USE_MPFR=%s' % yes_no('+mpfr'), 'MFEM_USE_OPENMP=%s' % yes_no('+openmp')] + if '+mpi' in spec: + options += ['MPICXX=%s' % spec['mpi'].mpicxx] + if '+hypre' in spec: options += [ 'HYPRE_DIR=%s' % spec['hypre'].prefix, |