zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dealii: do not hardcode prefix.include for BLAS/LAPACK (#10008)

Browse Source 
* dealii: do not hardcode prefix.include for BLAS/LAPACK

* dealii: rename lapack_blas -> lapack_blas_libs
This commit is contained in:
Denis Davydov 2018-12-04 23:55:41 +01:00 committed by Adam J. Stewart
parent ce485731bb
commit 121362383b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
var/spack/repos/builtin/packages/dealii/package.py
View File

@ -190,7 +190,8 @@ def cmake_args(self):
# debug and release flags # debug and release flags
cxx_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([ options.extend([
'-DDEAL_II_COMPONENT_EXAMPLES=ON', '-DDEAL_II_COMPONENT_EXAMPLES=ON',
'-DDEAL_II_WITH_THREADS:BOOL=ON', '-DDEAL_II_WITH_THREADS:BOOL=ON',
@ -199,9 +200,9 @@ def cmake_args(self):
# of Spack's. Be more specific to avoid this. # of Spack's. Be more specific to avoid this.
# Note that both lapack and blas are provided in -DLAPACK_XYZ. # Note that both lapack and blas are provided in -DLAPACK_XYZ.
'-DLAPACK_FOUND=true', '-DLAPACK_FOUND=true',
'-DLAPACK_INCLUDE_DIRS=%s;%s' % ( '-DLAPACK_INCLUDE_DIRS=%s' % ';'.join(
spec['lapack'].prefix.include, spec['blas'].prefix.include), lapack_blas_headers.directories),
'-DLAPACK_LIBRARIES=%s' % lapack_blas.joined(';'), '-DLAPACK_LIBRARIES=%s' % lapack_blas_libs.joined(';'),
'-DUMFPACK_DIR=%s' % spec['suite-sparse'].prefix, '-DUMFPACK_DIR=%s' % spec['suite-sparse'].prefix,
'-DTBB_DIR=%s' % spec['tbb'].prefix, '-DTBB_DIR=%s' % spec['tbb'].prefix,
'-DZLIB_DIR=%s' % spec['zlib'].prefix, '-DZLIB_DIR=%s' % spec['zlib'].prefix,