summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Davydov <davydden@gmail.com>2016-07-16 07:31:38 +0200
committerDenis Davydov <davydden@gmail.com>2016-07-16 07:31:38 +0200
commit987fb137f97b8673efdcd126bef56bc6c8d06dc0 (patch)
tree6b002516b50f115879608981fd9260e78d668e42
parent514c61b8fe923de7eb0c41205fdfaae48afb5cdf (diff)
downloadspack-987fb137f97b8673efdcd126bef56bc6c8d06dc0.tar.gz
spack-987fb137f97b8673efdcd126bef56bc6c8d06dc0.tar.bz2
spack-987fb137f97b8673efdcd126bef56bc6c8d06dc0.tar.xz
spack-987fb137f97b8673efdcd126bef56bc6c8d06dc0.zip
trilinos: don't hardcode blas/lapack names
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index 3a53ac5c01..100e30169d 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -116,6 +116,7 @@ class Trilinos(Package):
options.extend(std_cmake_args)
mpi_bin = spec['mpi'].prefix.bin
+ # Note: -DXYZ_LIBRARY_NAMES= needs semicolon separated list of names
options.extend([
'-DTrilinos_ENABLE_ALL_PACKAGES:BOOL=ON',
'-DTrilinos_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON',
@@ -129,10 +130,12 @@ class Trilinos(Package):
'-DTPL_ENABLE_MPI:BOOL=ON',
'-DMPI_BASE_DIR:PATH=%s' % spec['mpi'].prefix,
'-DTPL_ENABLE_BLAS=ON',
- '-DBLAS_LIBRARY_NAMES=blas', # FIXME: don't hardcode names
+ '-DBLAS_LIBRARY_NAMES=%s' % to_lib_name(
+ spec['blas'].blas_shared_lib),
'-DBLAS_LIBRARY_DIRS=%s' % spec['blas'].prefix.lib,
'-DTPL_ENABLE_LAPACK=ON',
- '-DLAPACK_LIBRARY_NAMES=lapack',
+ '-DLAPACK_LIBRARY_NAMES=%s' % to_lib_name(
+ spec['lapack'].lapack_shared_lib),
'-DLAPACK_LIBRARY_DIRS=%s' % spec['lapack'].prefix,
'-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON',
'-DTrilinos_ENABLE_CXX11:BOOL=ON',