From 121362383bb3bbc5ccef49e98a4885a09bf0c728 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Tue, 4 Dec 2018 23:55:41 +0100 Subject: dealii: do not hardcode prefix.include for BLAS/LAPACK (#10008) * dealii: do not hardcode prefix.include for BLAS/LAPACK * dealii: rename lapack_blas -> lapack_blas_libs --- var/spack/repos/builtin/packages/dealii/package.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 55cd7cbd00..5292216914 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -190,7 +190,8 @@ class Dealii(CMakePackage, CudaPackage): # debug and release flags cxx_flags = [] - lapack_blas = spec['lapack'].libs + spec['blas'].libs + lapack_blas_libs = spec['lapack'].libs + spec['blas'].libs + lapack_blas_headers = spec['lapack'].headers + spec['blas'].headers options.extend([ '-DDEAL_II_COMPONENT_EXAMPLES=ON', '-DDEAL_II_WITH_THREADS:BOOL=ON', @@ -199,9 +200,9 @@ class Dealii(CMakePackage, CudaPackage): # of Spack's. Be more specific to avoid this. # Note that both lapack and blas are provided in -DLAPACK_XYZ. '-DLAPACK_FOUND=true', - '-DLAPACK_INCLUDE_DIRS=%s;%s' % ( - spec['lapack'].prefix.include, spec['blas'].prefix.include), - '-DLAPACK_LIBRARIES=%s' % lapack_blas.joined(';'), + '-DLAPACK_INCLUDE_DIRS=%s' % ';'.join( + lapack_blas_headers.directories), + '-DLAPACK_LIBRARIES=%s' % lapack_blas_libs.joined(';'), '-DUMFPACK_DIR=%s' % spec['suite-sparse'].prefix, '-DTBB_DIR=%s' % spec['tbb'].prefix, '-DZLIB_DIR=%s' % spec['zlib'].prefix, -- cgit v1.2.3-60-g2f50