diff options
| author | Denis Davydov <davydden@gmail.com> | 2019-04-10 14:51:39 +0200 |
|---|---|---|
| committer | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2019-04-10 14:51:38 +0200 |
| commit | 1e9748a3c80373a4b4274f993cb8be225320e91c (patch) | |
| tree | a4e066d791979fb42a2b2f36c72dc869bf8ead88 /var | |
| parent | b2611c80862628046556c73e1e9da6ec69060428 (diff) | |
| download | spack-1e9748a3c80373a4b4274f993cb8be225320e91c.tar.gz spack-1e9748a3c80373a4b4274f993cb8be225320e91c.tar.bz2 spack-1e9748a3c80373a4b4274f993cb8be225320e91c.tar.xz spack-1e9748a3c80373a4b4274f993cb8be225320e91c.zip | |
dealii: fix build with tbb from intel parallel studio (#11138)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/dealii/package.py | 14 |
1 files changed, 13 insertions, 1 deletions
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 @@ class Dealii(CMakePackage, CudaPackage): 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')): |