From 4fbb82207220a0717dbf8e8fdba6e9f0c03f6429 Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Fri, 20 May 2022 19:17:30 -0400
Subject: visit: Overhaul to build in the DAV SDK (#30594)

* mesa-glu and mesa-demos: Fix conflicts with glu and osmesa

* visit: Update visit dependencies

* ecp-data-vis-sdk: Enable +visit

* ci[data-vis-sdk]: Enable +visit
---
 .../cloud_pipelines/stacks/data-vis-sdk/spack.yaml | 37 +++++++++++-----------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'share')

diff --git a/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml
index d744820f1a..e11b6d7189 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml
@@ -15,33 +15,32 @@ spack:
   packages:
     cmake:
       variants: ~ownlibs
-    curl:
-      variants: tls=mbedtls
     mesa:
       variants: +glx ~osmesa +opengl ~opengles +llvm
     paraview:
       variants: +qt
+    visit:
+      variants: +gui
     all:
       target: [x86_64]
 
-  # The spec will be gradually expanded to enable all the SDK components.
-  # Currently disabled: ascent, catalyst, visit
+  # Currently disabled: sensei
   specs:
-  - matrix:
-    - - ecp-data-vis-sdk
-          +adios2
-          +ascent
-          +cinema
-          +darshan
-          +faodel
-          +hdf5
-          +paraview
-          +pnetcdf
-          +sz
-          +unifyfs
-          +veloc
-          +vtkm
-          +zfp
+    - ecp-data-vis-sdk ~cuda ~rocm ~sensei
+        +adios2
+        +ascent
+        +cinema
+        +darshan
+        +faodel
+        +hdf5
+        +paraview
+        +pnetcdf
+        +sz
+        +unifyfs
+        +veloc
+        +vtkm
+        +zfp
+        +visit
 
   mirrors: { "mirror": "s3://spack-binaries/data-vis-sdk" }
 
-- 
cgit v1.2.3-70-g09d2