diff options
| author | eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> | 2023-05-15 19:25:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-15 17:25:14 -0700 |
| commit | f7bbc326e4eab8a9bb82091b94034b6da5f25f68 (patch) | |
| tree | 2354ae16cf7a8dc17b59bd6238028815fa678d80 | |
| parent | a184bfc1a67814bf98151f120b7acbb412ba036f (diff) | |
| download | spack-f7bbc326e4eab8a9bb82091b94034b6da5f25f68.tar.gz spack-f7bbc326e4eab8a9bb82091b94034b6da5f25f68.tar.bz2 spack-f7bbc326e4eab8a9bb82091b94034b6da5f25f68.tar.xz spack-f7bbc326e4eab8a9bb82091b94034b6da5f25f68.zip | |
trilinos: @develop fixes (#37615)
* trilinos@develop fixes
* Update var/spack/repos/builtin/packages/trilinos/package.py
Co-authored-by: Seth R. Johnson <johnsonsr@ornl.gov>
---------
Co-authored-by: Seth R. Johnson <johnsonsr@ornl.gov>
| -rw-r--r-- | var/spack/repos/builtin/packages/trilinos/package.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 78b855bcde..f3779c0234 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -656,6 +656,9 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): ] ) + if spec.satisfies("@develop +stokhos"): + options.append(self.define("Stokhos_ENABLE_PCE_Scalar_Type", False)) + if "+dtk" in spec: options.extend( [ @@ -771,7 +774,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): ] if spec.satisfies("@12.12.1:"): tpl_dep_map.append(("Pnetcdf", "parallel-netcdf")) - if spec.satisfies("@13:"): + if spec.satisfies("@13:") and not spec.satisfies("@develop"): tpl_dep_map.append(("HWLOC", "hwloc")) for tpl_name, dep_name in tpl_dep_map: |