diff options
| author | Denis Davydov <davydden@gmail.com> | 2016-03-23 07:33:28 +0100 |
|---|---|---|
| committer | Denis Davydov <davydden@gmail.com> | 2016-03-25 11:56:39 +0100 |
| commit | b6a35716ce3e02e1a3661e2433986ad637b65d0c (patch) | |
| tree | 09ec1ae4b2c8d33b8e601e370cdfd5a54192aa2b | |
| parent | b91a155e8d996c9e51da7f75d4e106469ba488e6 (diff) | |
| download | spack-b6a35716ce3e02e1a3661e2433986ad637b65d0c.tar.gz spack-b6a35716ce3e02e1a3661e2433986ad637b65d0c.tar.bz2 spack-b6a35716ce3e02e1a3661e2433986ad637b65d0c.tar.xz spack-b6a35716ce3e02e1a3661e2433986ad637b65d0c.zip | |
same
| -rw-r--r-- | var/spack/repos/builtin/packages/trilinos/package.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 2937ed4c38..b31cf880bc 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -43,6 +43,8 @@ class Trilinos(Package): depends_on('python') # Needs py-numpy activated + patch('umfpack_from_suitesparse.patch') + def install(self, spec, prefix): options = [] options.extend(std_cmake_args) @@ -76,9 +78,11 @@ class Trilinos(Package): # suite-sparse related options.extend([ '-DTPL_ENABLE_Cholmod:BOOL=ON', - '-DCholmod_BASE_DIR:PATH=%s' % spec['suite-sparse'].prefix, + '-DCholmod_LIBRARY_DIRS=%s' % spec['suite-sparse'].prefix.lib, + '-DCholmod_INCLUDE_DIRS:PATH=%s' % spec['suite-sparse'].prefix.include, '-DTPL_ENABLE_UMFPACK:BOOL=ON', - '-D_UMFPACK_BASE_DIR:PATH=%s' % spec['suite-sparse'].prefix, + '-D_UMFPACK_LIBRARY_DIRS:PATH=%s' % spec['suite-sparse'].prefix.lib, + '-D_UMFPACK_INCLUDE_DIRS:PATH=%s' % spec['suite-sparse'].prefix.include, '-DUMFPACK_LIBRARY_NAMES=umfpack;amd;colamd;cholmod;suitesparseconfig' ]) @@ -117,7 +121,7 @@ class Trilinos(Package): ]) options.extend([ '-DTPL_ENABLE_SuperLUDist:BOOL=ON', - '-DSuperLUDist_BASE_DIR:PATH=%s' % spec['superlu-dist'].prefix, + '-DSuperLUDist_LIBRARY_DIRS=%s' % spec['superlu-dist'].prefix.lib, '-DSuperLUDist_INCLUDE_DIRS=%s' % spec['superlu-dist'].prefix.include ]) if spec.satisfies('^superlu-dist@4.0:'): |