From ea453db674b08b85f0f03bd47363453832bd21fb Mon Sep 17 00:00:00 2001 From: Eric Brugger Date: Thu, 14 Oct 2021 21:58:43 -0700 Subject: vtk: modify conflict between osmesa and qt (#26752) --- var/spack/repos/builtin/packages/vtk/package.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index d3513f385b..f33bdce640 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -50,9 +50,8 @@ class Vtk(CMakePackage): patch('https://gitlab.kitware.com/vtk/vtk/-/commit/e066c3f4fbbfe7470c6207db0fc3f3952db633c.diff', when="@9:", sha256='0546696bd02f3a99fccb9b7c49533377bf8179df16d901cefe5abf251173716d') - # At the moment, we cannot build with both osmesa and qt, but as of - # VTK 8.1, that should change - conflicts('+osmesa', when='+qt') + # We cannot build with both osmesa and qt prior to VTK 8.1 + conflicts('+osmesa', when='@:8.0 +qt') extends('python', when='+python') -- cgit v1.2.3-70-g09d2