SDK: Require paraview@5.10: in the ECP SDK (#30372)

* SDK: Require paraview@5.10: in the ECP SDK

* SDK: Updated dev src conflicts to be more explicit
This commit is contained in:
kwryankrattiger 2022-04-28 14:38:42 -05:00 committed by GitHub
parent bb43308c44
commit f6d2b07368
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -133,11 +133,11 @@ def exclude_variants(variants, exclude):
depends_on('ascent ^conduit ~hdf5_compat', when='+ascent +hdf5') depends_on('ascent ^conduit ~hdf5_compat', when='+ascent +hdf5')
# Disable configuring with @develop. This should be removed after ascent # Disable configuring with @develop. This should be removed after ascent
# releases 0.8 and ascent can build with conduit@0.8: and vtk-m@1.7: # releases 0.8 and ascent can build with conduit@0.8: and vtk-m@1.7:
conflicts('ascent@develop') conflicts('ascent@develop', when='+ascent')
depends_on('py-cinemasci', when='+cinema') depends_on('py-cinemasci', when='+cinema')
dav_sdk_depends_on('paraview+mpi+python3+kits+shared', dav_sdk_depends_on('paraview@5.10:+mpi+python3+kits+shared',
when='+paraview', when='+paraview',
propagate=['hdf5', 'adios2']) propagate=['hdf5', 'adios2'])
# ParaView needs @5.11: in order to use cuda and be compatible with other # ParaView needs @5.11: in order to use cuda and be compatible with other
@ -147,7 +147,7 @@ def exclude_variants(variants, exclude):
depends_on('paraview {0}'.format(cuda_arch), depends_on('paraview {0}'.format(cuda_arch),
when='+paraview {0} ^paraview@5.11:'.format(cuda_arch)) when='+paraview {0} ^paraview@5.11:'.format(cuda_arch))
depends_on('paraview ~cuda', when='+paraview ~cuda') depends_on('paraview ~cuda', when='+paraview ~cuda')
conflicts('paraview@master') conflicts('paraview@master', when='+paraview')
dav_sdk_depends_on('visit', when='+visit') dav_sdk_depends_on('visit', when='+visit')