From d0cf3db46e708497f5c8970d9e3f9b1787a93da4 Mon Sep 17 00:00:00 2001 From: "Michael F. Herbst" Date: Mon, 16 Oct 2017 12:57:01 +0200 Subject: armadillo: use libs to provide arpack and superlu libraries (#5777) --- var/spack/repos/builtin/packages/armadillo/package.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'var') 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') ] -- cgit v1.2.3-70-g09d2