trilinos: fix boost variant/dependency error for minitensor (#24985)
This commit is contained in:
parent
c1567463b0
commit
2fd24f8542
@ -337,6 +337,9 @@ class Trilinos(CMakePackage, CudaPackage):
|
|||||||
conflicts('cxxstd=14', when='+wrapper ^cuda@6.5.14:8.0.61')
|
conflicts('cxxstd=14', when='+wrapper ^cuda@6.5.14:8.0.61')
|
||||||
conflicts('cxxstd=17', when='+wrapper ^cuda@6.5.14:10.2.89')
|
conflicts('cxxstd=17', when='+wrapper ^cuda@6.5.14:10.2.89')
|
||||||
|
|
||||||
|
# Boost requires minitensor
|
||||||
|
conflicts('~boost', when='+minitensor')
|
||||||
|
|
||||||
# SCOREC requires shards, stk, and zoltan
|
# SCOREC requires shards, stk, and zoltan
|
||||||
conflicts('+scorec', when='~mpi')
|
conflicts('+scorec', when='~mpi')
|
||||||
conflicts('+scorec', when='~shards')
|
conflicts('+scorec', when='~shards')
|
||||||
@ -375,7 +378,6 @@ class Trilinos(CMakePackage, CudaPackage):
|
|||||||
depends_on('parmetis', when='+scorec')
|
depends_on('parmetis', when='+scorec')
|
||||||
depends_on('cgns', when='+cgns')
|
depends_on('cgns', when='+cgns')
|
||||||
depends_on('adios2', when='+adios2')
|
depends_on('adios2', when='+adios2')
|
||||||
depends_on('boost', when='+minitensor')
|
|
||||||
# Trilinos' Tribits config system is limited which makes it very tricky to
|
# Trilinos' Tribits config system is limited which makes it very tricky to
|
||||||
# link Amesos with static MUMPS, see
|
# link Amesos with static MUMPS, see
|
||||||
# https://trilinos.org/docs/dev/packages/amesos2/doc/html/classAmesos2_1_1MUMPS.html
|
# https://trilinos.org/docs/dev/packages/amesos2/doc/html/classAmesos2_1_1MUMPS.html
|
||||||
|
Loading…
Reference in New Issue
Block a user