diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/paraview/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/paraview/package.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index b5c5cf7ca4..d98d1b6a27 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -139,9 +139,6 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): msg="Use paraview@5.9.0 with %xl_r. Earlier versions are not able to build with xl.", ) - # Newer abseil-cpp requires C++14, but paraview uses C++11 by default - conflicts("^abseil-cpp@2023:") - # We only support one single Architecture for _arch, _other_arch in itertools.permutations(CudaPackage.cuda_arch_values, 2): conflicts( @@ -226,6 +223,9 @@ class Paraview(CMakePackage, CudaPackage, ROCmPackage): depends_on("protobuf@3.4:3.18", when="@:5.10%intel@2021:") depends_on("protobuf@3.4:3.18", when="@:5.10%xl") depends_on("protobuf@3.4:3.18", when="@:5.10%xl_r") + # protobuf requires newer abseil-cpp, which in turn requires C++14, + # but paraview uses C++11 by default + depends_on("protobuf@3.4:3.21", when="@:5.11") depends_on("libxml2") depends_on("lz4") depends_on("xz") |