summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Davydov <davydden@gmail.com>2018-12-04 23:55:41 +0100
committerAdam J. Stewart <ajstewart426@gmail.com>2018-12-04 16:55:41 -0600
commit121362383bb3bbc5ccef49e98a4885a09bf0c728 (patch)
tree09df0ee39a144a1f4238575c9b8662c1a86aff3e
parentce485731bb3f5bca17226c8822a27d0ee1edfad1 (diff)
downloadspack-121362383bb3bbc5ccef49e98a4885a09bf0c728.tar.gz
spack-121362383bb3bbc5ccef49e98a4885a09bf0c728.tar.bz2
spack-121362383bb3bbc5ccef49e98a4885a09bf0c728.tar.xz
spack-121362383bb3bbc5ccef49e98a4885a09bf0c728.zip
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
-rw-r--r--var/spack/repos/builtin/packages/dealii/package.py9
1 files changed, 5 insertions, 4 deletions
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,