Updates to Armadillo package

This commit is contained in:
Adam J. Stewart 2016-07-19 12:33:04 -05:00
parent a64a2e72cf
commit afa4cdc2d8

View file

@ -33,11 +33,13 @@ class Armadillo(Package):
homepage = "http://arma.sourceforge.net/" homepage = "http://arma.sourceforge.net/"
url = "http://sourceforge.net/projects/arma/files/armadillo-7.200.1.tar.xz" url = "http://sourceforge.net/projects/arma/files/armadillo-7.200.1.tar.xz"
version('7.200.2', 'b21585372d67a8876117fd515d8cf0a2')
version('7.200.1', 'ed86d6df0058979e107502e1fe3e469e') version('7.200.1', 'ed86d6df0058979e107502e1fe3e469e')
variant('hdf5', default=False, description='Include HDF5 support') variant('hdf5', default=False, description='Include HDF5 support')
depends_on('arpack') depends_on('cmake@2.8:', type='build')
depends_on('arpack-ng') # old arpack causes undefined symbols
depends_on('blas') depends_on('blas')
depends_on('lapack') depends_on('lapack')
depends_on('superlu@5.2:') depends_on('superlu@5.2:')
@ -46,8 +48,8 @@ class Armadillo(Package):
def install(self, spec, prefix): def install(self, spec, prefix):
cmake_args = [ cmake_args = [
# ARPACK support # ARPACK support
'-DARPACK_LIBRARY={0}/libarpack.a'.format( '-DARPACK_LIBRARY={0}/libarpack.so'.format(
spec['arpack'].prefix.lib), spec['arpack-ng'].prefix.lib),
# BLAS support # BLAS support
'-DBLAS_LIBRARY={0}'.format(spec['blas'].blas_shared_lib), '-DBLAS_LIBRARY={0}'.format(spec['blas'].blas_shared_lib),
# LAPACK support # LAPACK support