summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2016-05-05 01:00:55 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2016-05-05 01:00:55 -0700
commit56557f7ff679c0434e808e6cc9763449cdefdaee (patch)
tree80ae2604048119a563f90510974a89f1a5c45ddb
parent4ee1bca1d952c63a3e25181865aba23706be16e1 (diff)
parent2eb4248f90650f83b7fca7587d59e8fc16bb5305 (diff)
downloadspack-56557f7ff679c0434e808e6cc9763449cdefdaee.tar.gz
spack-56557f7ff679c0434e808e6cc9763449cdefdaee.tar.bz2
spack-56557f7ff679c0434e808e6cc9763449cdefdaee.tar.xz
spack-56557f7ff679c0434e808e6cc9763449cdefdaee.zip
Merge pull request #871 from davydden/dealii_updated_dependencies
dealii: add new dependency -- gsl
-rw-r--r--var/spack/repos/builtin/packages/dealii/package.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py
index 674fe3150a..df8330384d 100644
--- a/var/spack/repos/builtin/packages/dealii/package.py
+++ b/var/spack/repos/builtin/packages/dealii/package.py
@@ -12,6 +12,7 @@ class Dealii(Package):
variant('mpi', default=True, description='Compile with MPI')
variant('arpack', default=True, description='Compile with Arpack and PArpack (only with MPI)')
variant('doc', default=False, description='Compile with documentation')
+ variant('gsl' , default=True, description='Compile with GSL')
variant('hdf5', default=True, description='Compile with HDF5 (only with MPI)')
variant('metis', default=True, description='Compile with Metis')
variant('netcdf', default=True, description='Compile with Netcdf (only with MPI)')
@@ -39,6 +40,8 @@ class Dealii(Package):
depends_on ("mpi", when="+mpi")
depends_on ("arpack-ng+mpi", when='+arpack+mpi')
depends_on ("doxygen", when='+doc')
+ depends_on ("gsl", when='@8.5.0:+gsl')
+ depends_on ("gsl", when='@dev+gsl')
depends_on ("hdf5+mpi~cxx", when='+hdf5+mpi') #FIXME NetCDF declares dependency with ~cxx, why?
depends_on ("metis@5:", when='+metis')
depends_on ("netcdf+mpi", when="+netcdf+mpi")
@@ -80,7 +83,6 @@ class Dealii(Package):
(join_path(spec['lapack'].prefix.lib,'liblapack.%s' % dsuf), # FIXME don't hardcode names
join_path(spec['blas'].prefix.lib,'libblas.%s' % dsuf)), # FIXME don't hardcode names
'-DMUPARSER_DIR=%s ' % spec['muparser'].prefix,
- '-DP4EST_DIR=%s' % spec['p4est'].prefix,
'-DUMFPACK_DIR=%s' % spec['suite-sparse'].prefix,
'-DTBB_DIR=%s' % spec['tbb'].prefix,
'-DZLIB_DIR=%s' % spec['zlib'].prefix
@@ -100,7 +102,7 @@ class Dealii(Package):
])
# Optional dependencies for which librariy names are the same as CMake variables
- for library in ('hdf5', 'p4est','petsc', 'slepc','trilinos','metis'):
+ for library in ('gsl','hdf5','p4est','petsc','slepc','trilinos','metis'):
if library in spec:
options.extend([
'-D{library}_DIR={value}'.format(library=library.upper(), value=spec[library].prefix),