diff options
| author | Jon Rood <jon.rood@nrel.gov> | 2019-08-07 15:11:15 -0600 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2019-08-07 16:11:15 -0500 |
| commit | 941eb5d7566bbd12cd0d3ef18f0f8deec0c10333 (patch) | |
| tree | 2bb903e51d592a629ad4a303616d0ebe5e88de86 /var | |
| parent | 0c9bc8da86ba2c5e1da02ccfa30e3592a8c5f975 (diff) | |
| download | spack-941eb5d7566bbd12cd0d3ef18f0f8deec0c10333.tar.gz spack-941eb5d7566bbd12cd0d3ef18f0f8deec0c10333.tar.bz2 spack-941eb5d7566bbd12cd0d3ef18f0f8deec0c10333.tar.xz spack-941eb5d7566bbd12cd0d3ef18f0f8deec0c10333.zip | |
Generalize STK package settings in Trilinos (#11917)
* Making STK package in Trilinos more general.
* Remove comment about seacas exodus settings.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/trilinos/package.py | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index f27b1e79c4..b484599c66 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -450,21 +450,12 @@ class Trilinos(CMakePackage): options.extend(['-DUSE_XSDK_DEFAULTS=YES']) if '+stk' in spec: - # Currently these are fairly specific to the Nalu package - # They can likely change when necessary in the future - options.extend([ - '-DTrilinos_ENABLE_STKMesh:BOOL=ON', - '-DTrilinos_ENABLE_STKNGP:BOOL=ON', - '-DTrilinos_ENABLE_STKSimd:BOOL=ON', - '-DTrilinos_ENABLE_STKIO:BOOL=ON', - '-DTrilinos_ENABLE_STKTransfer:BOOL=ON', - '-DTrilinos_ENABLE_STKSearch:BOOL=ON', - '-DTrilinos_ENABLE_STKUtil:BOOL=ON', - '-DTrilinos_ENABLE_STKTopology:BOOL=ON', - '-DTrilinos_ENABLE_STKUnit_tests:BOOL=ON', - '-DTrilinos_ENABLE_STKUnit_test_utils:BOOL=ON', - '-DTrilinos_ENABLE_STKClassic:BOOL=OFF', - '-DTrilinos_ENABLE_STKExprEval:BOOL=ON' + options.extend([ + '-DTrilinos_ENABLE_STK:BOOL=ON' + ]) + else: + options.extend([ + '-DTrilinos_ENABLE_STK:BOOL=OFF' ]) if '+dtk' in spec: @@ -474,21 +465,19 @@ class Trilinos(CMakePackage): ]) if '+exodus' in spec: - # Currently these are fairly specific to the Nalu package - # They can likely change when necessary in the future options.extend([ '-DTrilinos_ENABLE_SEACAS:BOOL=ON', '-DTrilinos_ENABLE_SEACASExodus:BOOL=ON', + '-DTrilinos_ENABLE_SEACASIoss:BOOL=ON', '-DTrilinos_ENABLE_SEACASEpu:BOOL=ON', '-DTrilinos_ENABLE_SEACASExodiff:BOOL=ON', '-DTrilinos_ENABLE_SEACASNemspread:BOOL=ON', - '-DTrilinos_ENABLE_SEACASNemslice:BOOL=ON', - '-DTrilinos_ENABLE_SEACASIoss:BOOL=ON' + '-DTrilinos_ENABLE_SEACASNemslice:BOOL=ON' ]) else: options.extend([ - '-DTrilinos_ENABLE_SEACAS:BOOL=OFF', - '-DTrilinos_ENABLE_SEACASExodus:BOOL=OFF' + '-DTrilinos_ENABLE_SEACASExodus:BOOL=OFF', + '-DTrilinos_ENABLE_SEACASIoss:BOOL=OFF' ]) if '+chaco' in spec: |