diff options
| author | kwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com> | 2022-04-28 14:38:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-28 13:38:42 -0600 |
| commit | f6d2b0736898207ecbcb83772847dc4020d2f5cc (patch) | |
| tree | 44903a879d52d18c01386102c0be9d02d617243b /var | |
| parent | bb43308c444651f560c920c248257fa9e8dc4b18 (diff) | |
| download | spack-f6d2b0736898207ecbcb83772847dc4020d2f5cc.tar.gz spack-f6d2b0736898207ecbcb83772847dc4020d2f5cc.tar.bz2 spack-f6d2b0736898207ecbcb83772847dc4020d2f5cc.tar.xz spack-f6d2b0736898207ecbcb83772847dc4020d2f5cc.zip | |
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
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py b/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py index bf34748f45..e988c62e64 100644 --- a/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py +++ b/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py @@ -133,11 +133,11 @@ class EcpDataVisSdk(BundlePackage, CudaPackage, ROCmPackage): depends_on('ascent ^conduit ~hdf5_compat', when='+ascent +hdf5') # 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: - conflicts('ascent@develop') + conflicts('ascent@develop', when='+ascent') 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', propagate=['hdf5', 'adios2']) # ParaView needs @5.11: in order to use cuda and be compatible with other @@ -147,7 +147,7 @@ class EcpDataVisSdk(BundlePackage, CudaPackage, ROCmPackage): depends_on('paraview {0}'.format(cuda_arch), when='+paraview {0} ^paraview@5.11:'.format(cuda_arch)) depends_on('paraview ~cuda', when='+paraview ~cuda') - conflicts('paraview@master') + conflicts('paraview@master', when='+paraview') dav_sdk_depends_on('visit', when='+visit') |