Cleaning up

This commit is contained in:
Massimiliano Culpo
2016-01-29 11:42:06 +01:00
parent b574c4ad51
commit cd54793913
2 changed files with 7 additions and 8 deletions

View File

@@ -17,7 +17,6 @@ class Trilinos(Package):
version('11.14.2', 'a43590cf896c677890d75bfe75bc6254')
version('11.14.1', '40febc57f76668be8b6a77b7607bb67f')
variant('mpi', default=True, description='Add a dependency on MPI and enables MPI dependent packages')
variant('shared', default=True, description='Enables the build of shared libraries')
variant('debug', default=False, description='Builds a debug version of the libraries')
@@ -30,9 +29,8 @@ class Trilinos(Package):
depends_on('swig')
# MPI related dependencies
depends_on('mpi', when='+mpi')
depends_on('netcdf+mpi', when='+mpi')
depends_on('netcdf~mpi', when='~mpi')
depends_on('mpi')
depends_on('netcdf+mpi')
depends_on('python') # Needs py-numpy activated
@@ -45,7 +43,7 @@ def install(self, spec, prefix):
'-DTrilinos_ENABLE_EXAMPLES:BOOL=OFF',
'-DCMAKE_BUILD_TYPE:STRING=%s' % ('Debug' if '+debug' in spec else 'Release'),
'-DBUILD_SHARED_LIBS:BOOL=%s' % ('ON' if '+shared' in spec else 'OFF'),
'-DTPL_ENABLE_MPI:BOOL=%s' % ('ON' if '+mpi' in spec else 'OFF'),
'-DTPL_ENABLE_MPI:STRING=ON',
'-DBLAS_LIBRARY_DIRS:PATH=%s' % spec['blas'].prefix,
'-DLAPACK_LIBRARY_DIRS:PATH=%s' % spec['lapack'].prefix
])