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>
This commit is contained in:
parent
a184bfc1a6
commit
f7bbc326e4
1 changed files with 4 additions and 1 deletions
|
@ -656,6 +656,9 @@ def define_enable(suffix, value=None):
|
|||
]
|
||||
)
|
||||
|
||||
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 @@ def define_tpl(trilinos_name, spack_name, have_dep):
|
|||
]
|
||||
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:
|
||||
|
|
Loading…
Reference in a new issue