From 284774cf43d087bf836ae65d3b2378a820c43cc7 Mon Sep 17 00:00:00 2001
From: Kenneth Moreland <kmorel@sandia.gov>
Date: Thu, 3 Sep 2020 14:22:15 -0600
Subject: [PATCH] Turn on "no virtual" option on some CI builds

Make sure that the `VTKm_NO_DEPRECATED_VIRTUAL` CMake option is building
correctly by adding it to some of the CI builds.
---
 .gitlab/ci/config/initial_config.cmake | 3 +++
 .gitlab/ci/ubuntu1604.yml              | 2 +-
 .gitlab/ci/ubuntu1804.yml              | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab/ci/config/initial_config.cmake b/.gitlab/ci/config/initial_config.cmake
index e4df50de0..c58a3935b 100644
--- a/.gitlab/ci/config/initial_config.cmake
+++ b/.gitlab/ci/config/initial_config.cmake
@@ -49,6 +49,9 @@ foreach(option IN LISTS options)
   elseif(no_rendering STREQUAL option)
     set(VTKm_ENABLE_RENDERING "OFF" CACHE STRING "")
 
+  elseif(no_virtual STREQUAL option)
+    set(VTKm_NO_DEPRECATED_VIRTUAL "ON" CACHE STRING "")
+
   elseif(examples STREQUAL option)
     set(VTKm_ENABLE_EXAMPLES "ON" CACHE STRING "")
 
diff --git a/.gitlab/ci/ubuntu1604.yml b/.gitlab/ci/ubuntu1604.yml
index 948f3a139..ce4b43231 100644
--- a/.gitlab/ci/ubuntu1604.yml
+++ b/.gitlab/ci/ubuntu1604.yml
@@ -17,7 +17,7 @@ build:ubuntu1604_gcc5:
     CC: "gcc-5"
     CXX: "g++-5"
     CMAKE_BUILD_TYPE: RelWithDebInfo
-    VTKM_SETTINGS: "cuda+pascal"
+    VTKM_SETTINGS: "cuda+pascal+no_virtual"
 
 test:ubuntu1604_gcc5:
   tags:
diff --git a/.gitlab/ci/ubuntu1804.yml b/.gitlab/ci/ubuntu1804.yml
index a83c45796..41c4858f8 100644
--- a/.gitlab/ci/ubuntu1804.yml
+++ b/.gitlab/ci/ubuntu1804.yml
@@ -55,7 +55,7 @@ build:ubuntu1804_gcc7:
   variables:
     CC: "gcc-7"
     CXX: "g++-7"
-    VTKM_SETTINGS: "cuda+turing+mpi+64bit_floats"
+    VTKM_SETTINGS: "cuda+turing+mpi+64bit_floats+no_virtual"
 
 test:ubuntu1804_gcc7:
   tags: