diff options
| author | Michael F. Herbst <info@michael-herbst.com> | 2017-10-16 12:57:01 +0200 |
|---|---|---|
| committer | Massimiliano Culpo <massimiliano.culpo@googlemail.com> | 2017-10-16 12:57:01 +0200 |
| commit | d0cf3db46e708497f5c8970d9e3f9b1787a93da4 (patch) | |
| tree | 11249bcdadf1e854b1b09eaa560f2d7935152c49 /var | |
| parent | f6c16de6de54c4f3a1a3f972f2236f1b2675fb3d (diff) | |
| download | spack-d0cf3db46e708497f5c8970d9e3f9b1787a93da4.tar.gz spack-d0cf3db46e708497f5c8970d9e3f9b1787a93da4.tar.bz2 spack-d0cf3db46e708497f5c8970d9e3f9b1787a93da4.tar.xz spack-d0cf3db46e708497f5c8970d9e3f9b1787a93da4.zip | |
armadillo: use libs to provide arpack and superlu libraries (#5777)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/armadillo/package.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/armadillo/package.py b/var/spack/repos/builtin/packages/armadillo/package.py index 71f72ac7e6..04c9b4c374 100644 --- a/var/spack/repos/builtin/packages/armadillo/package.py +++ b/var/spack/repos/builtin/packages/armadillo/package.py @@ -59,20 +59,16 @@ class Armadillo(CMakePackage): def cmake_args(self): spec = self.spec - arpack = find_libraries('libarpack', root=spec[ - 'arpack-ng'].prefix.lib64, shared=True) - superlu = find_libraries('libsuperlu', root=spec[ - 'superlu'].prefix, shared=False, recurse=True) return [ # ARPACK support - '-DARPACK_LIBRARY={0}'.format(arpack.joined()), + '-DARPACK_LIBRARY={0}'.format(spec['arpack-ng'].libs.joined(";")), # BLAS support - '-DBLAS_LIBRARY={0}'.format(spec['blas'].libs.joined()), + '-DBLAS_LIBRARY={0}'.format(spec['blas'].libs.joined(";")), # LAPACK support - '-DLAPACK_LIBRARY={0}'.format(spec['lapack'].libs.joined()), + '-DLAPACK_LIBRARY={0}'.format(spec['lapack'].libs.joined(";")), # SuperLU support '-DSuperLU_INCLUDE_DIR={0}'.format(spec['superlu'].prefix.include), - '-DSuperLU_LIBRARY={0}'.format(superlu.joined()), + '-DSuperLU_LIBRARY={0}'.format(spec['superlu'].libs.joined(";")), # HDF5 support '-DDETECT_HDF5={0}'.format('ON' if '+hdf5' in spec else 'OFF') ] |