diff options
| author | Denis Davydov <davydden@gmail.com> | 2016-03-28 17:52:22 +0200 |
|---|---|---|
| committer | Denis Davydov <davydden@gmail.com> | 2016-03-28 17:52:22 +0200 |
| commit | dd60cc326c12bfa8434b68afec72f4b68c18a94c (patch) | |
| tree | 819edf4dcf85c4103af6b5c116bbe6d8e958148b /var | |
| parent | 0da545ecac1c57a04abf814c9fed4f9929726ff5 (diff) | |
| download | spack-dd60cc326c12bfa8434b68afec72f4b68c18a94c.tar.gz spack-dd60cc326c12bfa8434b68afec72f4b68c18a94c.tar.bz2 spack-dd60cc326c12bfa8434b68afec72f4b68c18a94c.tar.xz spack-dd60cc326c12bfa8434b68afec72f4b68c18a94c.zip | |
adopt modifed superlu and hypre
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/trilinos/package.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 90b7bff149..b2dc8df0ea 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -52,7 +52,7 @@ class Trilinos(Package): depends_on('mumps@5.0:+mpi+shared',when='+mumps') # Amesos link errors with static: "__gfortran_adjustl", referenced from: _dmumps_ in libdmumps.a(dmumps_driver.o) "_mpi_abort_", referenced from: _mumps_abort_ in libmumps_common.a(tools_common.o) depends_on('scalapack',when='+mumps') depends_on('superlu-dist',when='+superlu-dist') - depends_on('hypre',when='+hypre') + depends_on('hypre~internal-superlu',when='+hypre') depends_on('hdf5+mpi',when='+hdf5') depends_on('python',when='+python') # Needs py-numpy activated @@ -179,7 +179,7 @@ class Trilinos(Package): options.extend([ '-DTPL_ENABLE_SuperLUDist:BOOL=ON', '-DSuperLUDist_LIBRARY_DIRS=%s' % spec['superlu-dist'].prefix.lib, - '-DSuperLUDist_INCLUDE_DIRS=%s/superlu_dist' % spec['superlu-dist'].prefix.include # superlu_dist and superlu have the same header names :-( In order to avoid conflicts, try to keep "dist" version headers in a subfolder + '-DSuperLUDist_INCLUDE_DIRS=%s' % spec['superlu-dist'].prefix.include ]) if spec.satisfies('^superlu-dist@4.0:'): options.extend([ |