diff --git a/.gitlab/ci/centos7.yml b/.gitlab/ci/centos7.yml index f712dec12..52dffe109 100644 --- a/.gitlab/ci/centos7.yml +++ b/.gitlab/ci/centos7.yml @@ -15,7 +15,7 @@ build:centos7_gcc48: variables: CMAKE_BUILD_TYPE: RelWithDebInfo CMAKE_GENERATOR: "Unix Makefiles" - VTKM_SETTINGS: "cuda+turing+32bit_ids" + VTKM_SETTINGS: "cuda+turing+32bit_ids+no_rendering" test:centos7_gcc48: tags: diff --git a/.gitlab/ci/config/initial_config.cmake b/.gitlab/ci/config/initial_config.cmake index 6a008755c..dfb919bbe 100644 --- a/.gitlab/ci/config/initial_config.cmake +++ b/.gitlab/ci/config/initial_config.cmake @@ -37,6 +37,12 @@ foreach(option IN LISTS options) set(VTKm_ENABLE_SANITIZER "ON" CACHE STRING "") list(APPEND sanitizers "leak") + elseif(rendering STREQUAL option) + set(VTKm_ENABLE_RENDERING "ON" CACHE STRING "") + + elseif(no_rendering STREQUAL option) + set(VTKm_ENABLE_RENDERING "OFF" 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 4b1167471..e0d6c14ba 100644 --- a/.gitlab/ci/ubuntu1604.yml +++ b/.gitlab/ci/ubuntu1604.yml @@ -90,7 +90,7 @@ build:ubuntu1604_gcc48: CMAKE_BUILD_TYPE: Release #custom openmpi install location CMAKE_PREFIX_PATH: "/opt/openmpi/" - VTKM_SETTINGS: "tbb+mpi+shared" + VTKM_SETTINGS: "tbb+mpi+shared+no_rendering" test:ubuntu1604_gcc48: tags: