From 1e9748a3c80373a4b4274f993cb8be225320e91c Mon Sep 17 00:00:00 2001
From: Denis Davydov <davydden@gmail.com>
Date: Wed, 10 Apr 2019 14:51:39 +0200
Subject: [PATCH] dealii: fix build with tbb from intel parallel studio
(#11138)
---
var/spack/repos/builtin/packages/dealii/package.py | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py
index e46dba7bc6..81c4bca985 100644
--- a/var/spack/repos/builtin/packages/dealii/package.py
+++ b/var/spack/repos/builtin/packages/dealii/package.py
@@ -224,11 +224,23 @@ def cmake_args(self):
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,
'-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
spec.satisfies('^intel-mkl+ilp64') or
spec.satisfies('^intel-parallel-studio+mkl+ilp64')):
--
GitLab