diff options
| author | Denis Davydov <davydden@gmail.com> | 2016-07-29 13:11:12 +0200 |
|---|---|---|
| committer | Denis Davydov <davydden@gmail.com> | 2016-07-29 13:11:12 +0200 |
| commit | b6ce0e6f0e750add5fdc9751f0ae581278a9f562 (patch) | |
| tree | be4a9a99e8e8bdf04fd5e568391e36a6ef8c9ae2 /var | |
| parent | 943896e237bc69a08ed5275542890e9284278f97 (diff) | |
| download | spack-b6ce0e6f0e750add5fdc9751f0ae581278a9f562.tar.gz spack-b6ce0e6f0e750add5fdc9751f0ae581278a9f562.tar.bz2 spack-b6ce0e6f0e750add5fdc9751f0ae581278a9f562.tar.xz spack-b6ce0e6f0e750add5fdc9751f0ae581278a9f562.zip | |
trilinos: make sure hdf5 is picked up from Spack
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/trilinos/package.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 469fd1091a..4d1d27e74a 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -143,11 +143,18 @@ class Trilinos(Package): '-DTrilinos_ENABLE_CXX11:BOOL=ON', '-DTPL_ENABLE_Netcdf:BOOL=ON', '-DTPL_ENABLE_HYPRE:BOOL=%s' % ( - 'ON' if '+hypre' in spec else 'OFF'), - '-DTPL_ENABLE_HDF5:BOOL=%s' % ( - 'ON' if '+hdf5' in spec else 'OFF'), + 'ON' if '+hypre' in spec else 'OFF') ]) + if '+hdf5' in spec: + options.extend([ + '-DTPL_ENABLE_HDF5:BOOL=ON', + '-DHDF5_INCLUDE_DIRS:PATH=%s' % spec['hdf5'].prefix.include, + '-DHDF5_LIBRARY_DIRS:PATH=%s' % spec['hdf5'].prefix.lib + ]) + else: + options.extend(['-DTPL_ENABLE_HDF5:BOOL=OFF']) + if '+boost' in spec: options.extend([ '-DTPL_ENABLE_Boost:BOOL=ON', |