summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorDenis Davydov <davydden@gmail.com>2016-03-23 08:05:18 +0100
committerDenis Davydov <davydden@gmail.com>2016-03-25 11:56:39 +0100
commitbc3314a57d43963416f709a94967ae8e1758c458 (patch)
tree68871aba12662df2636e385342cc10304e4c2750 /var
parent45b4895888a2abb3cf11ecf2b26b7940a9f89b5a (diff)
downloadspack-bc3314a57d43963416f709a94967ae8e1758c458.tar.gz
spack-bc3314a57d43963416f709a94967ae8e1758c458.tar.bz2
spack-bc3314a57d43963416f709a94967ae8e1758c458.tar.xz
spack-bc3314a57d43963416f709a94967ae8e1758c458.zip
more and more
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index b31cf880bc..77ae6f818d 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -64,7 +64,8 @@ class Trilinos(Package):
'-DLAPACK_LIBRARY_NAMES=lapack',
'-DLAPACK_LIBRARY_DIRS=/usr/lib', # % spec['lapack'].prefix, #FIXME
'-DTPL_ENABLE_Boost:BOOL=ON',
- '-DBoost_BASE_DIR:PATH=%s' % spec['boost'].prefix,
+ '-DBoost_INCLUDE_DIRS:PATH=%s' % spec['boost'].prefix.include,
+ '-DBoost_LIBRARY_DIRS:PATH=%s' % spec['boost'].prefix.lib,
'-DTrilinos_ENABLE_Fortran=OFF', # FIXME
'-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON',
'-DTrilinos_ENABLE_CXX11:BOOL=ON',
@@ -77,12 +78,13 @@ class Trilinos(Package):
# suite-sparse related
options.extend([
- '-DTPL_ENABLE_Cholmod:BOOL=ON',
- '-DCholmod_LIBRARY_DIRS=%s' % spec['suite-sparse'].prefix.lib,
- '-DCholmod_INCLUDE_DIRS:PATH=%s' % spec['suite-sparse'].prefix.include,
+ '-DTPL_ENABLE_Cholmod:BOOL=OFF', # FIXME: Trilinos seems to be looking for static libs only, patch CMake TPL file?
+ #'-DTPL_ENABLE_Cholmod:BOOL=ON',
+ #'-DCholmod_LIBRARY_DIRS:PATH=%s' % spec['suite-sparse'].prefix.lib,
+ #'-DCholmod_INCLUDE_DIRS:PATH=%s' % spec['suite-sparse'].prefix.include,
'-DTPL_ENABLE_UMFPACK:BOOL=ON',
- '-D_UMFPACK_LIBRARY_DIRS:PATH=%s' % spec['suite-sparse'].prefix.lib,
- '-D_UMFPACK_INCLUDE_DIRS:PATH=%s' % spec['suite-sparse'].prefix.include,
+ '-DUMFPACK_LIBRARY_DIRS:PATH=%s' % spec['suite-sparse'].prefix.lib,
+ '-DUMFPACK_INCLUDE_DIRS:PATH=%s' % spec['suite-sparse'].prefix.include,
'-DUMFPACK_LIBRARY_NAMES=umfpack;amd;colamd;cholmod;suitesparseconfig'
])