From f7bbc326e4eab8a9bb82091b94034b6da5f25f68 Mon Sep 17 00:00:00 2001 From: eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> Date: Mon, 15 May 2023 19:25:14 -0500 Subject: trilinos: @develop fixes (#37615) * trilinos@develop fixes * Update var/spack/repos/builtin/packages/trilinos/package.py Co-authored-by: Seth R. Johnson --------- Co-authored-by: Seth R. Johnson --- var/spack/repos/builtin/packages/trilinos/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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: -- cgit v1.2.3-60-g2f50