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

dealii: fix build with tbb from intel parallel studio (#11138)

Browse Source
This commit is contained in:
Denis Davydov 2019-04-10 14:51:39 +02:00 committed by Massimiliano Culpo
parent b2611c8086
commit 1e9748a3c8
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,11 +224,23 @@ def cmake_args(self):
lapack_blas_headers.directories), lapack_blas_headers.directories),
'-DLAPACK_LIBRARIES=%s' % lapack_blas_libs.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,
'-DZLIB_DIR=%s' % spec['zlib'].prefix, '-DZLIB_DIR=%s' % spec['zlib'].prefix,
'-DDEAL_II_ALLOW_BUNDLED=OFF' '-DDEAL_II_ALLOW_BUNDLED=OFF'
]) ])
if (spec.satisfies('^intel-parallel-studio+tbb')):
# deal.II/cmake will have hard time picking up TBB from Intel.
tbb_ver = '.'.join(('%s' % spec['tbb'].version).split('.')[1:])
options.extend([
'-DTBB_FOUND=true',
'-DTBB_VERSION=%s' % tbb_ver,
'-DTBB_INCLUDE_DIRS=%s' % ';'.join(
spec['tbb'].headers.directories),
'-DTBB_LIBRARIES=%s' % spec['tbb'].libs.joined(';')
])
else:
options.append('-DTBB_DIR=%s' % spec['tbb'].prefix)
if (spec.satisfies('^openblas+ilp64') or if (spec.satisfies('^openblas+ilp64') or
spec.satisfies('^intel-mkl+ilp64') or spec.satisfies('^intel-mkl+ilp64') or
spec.satisfies('^intel-parallel-studio+mkl+ilp64')): spec.satisfies('^intel-parallel-studio+mkl+ilp64')):