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

Trilinos: fix DEP_INCLUDE_DIRS definition (#27341)

Browse Source
This commit is contained in:
Daryl W. Grunau 2021-11-11 03:30:44 -07:00 committed by GitHub
parent 8d021a2915
commit 770bbba676
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -562,7 +562,7 @@ def define_tpl(trilinos_name, spack_name, have_dep):
depspec = spec[spack_name] depspec = spec[spack_name]
libs = depspec.libs libs = depspec.libs
options.extend([ options.extend([
define(trilinos_name + '_INCLUDE_DIRS', depspec.prefix.include), define(trilinos_name + '_INCLUDE_DIRS', depspec.headers.directories),
define(trilinos_name + '_ROOT', depspec.prefix), define(trilinos_name + '_ROOT', depspec.prefix),
define(trilinos_name + '_LIBRARY_NAMES', libs.names), define(trilinos_name + '_LIBRARY_NAMES', libs.names),
define(trilinos_name + '_LIBRARY_DIRS', libs.directories), define(trilinos_name + '_LIBRARY_DIRS', libs.directories),
@ -630,10 +630,9 @@ def define_tpl(trilinos_name, spack_name, have_dep):
spec['parmetis'].prefix.lib, spec['metis'].prefix.lib spec['parmetis'].prefix.lib, spec['metis'].prefix.lib
]), ]),
define('ParMETIS_LIBRARY_NAMES', ['parmetis', 'metis']), define('ParMETIS_LIBRARY_NAMES', ['parmetis', 'metis']),
define('TPL_ParMETIS_INCLUDE_DIRS', [ define('TPL_ParMETIS_INCLUDE_DIRS',
spec['parmetis'].prefix.include, spec['parmetis'].headers.directories +
spec['metis'].prefix.include spec['metis'].headers.directories),
]),
]) ])
if spec.satisfies('^superlu-dist@4.0:'): if spec.satisfies('^superlu-dist@4.0:'):