Merge pull request #15515 from tamiko/remove_vtk

[9.5] CMake: remove VTK configure option
dealii · Jun 29, 2023 · 0254974 · 0254974
2 parents 2190366 + 6f562f2
commit 0254974
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 219 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -105,7 +105,7 @@ jobs:
         export OMPI_MCA_btl_base_warn_component_unused='0'
 
         cd build
-        make -j2 setup_tests_simplex setup_tests_vtk
+        make -j2 setup_tests_simplex
         ctest --output-on-failure -j2
     - name: failed test log
       if: ${{ failure() }}

diff --git a/cmake/configure/configure_50_vtk.cmake b/cmake/configure/configure_50_vtk.cmake
diff --git a/cmake/modules/FindDEAL_II_VTK.cmake b/cmake/modules/FindDEAL_II_VTK.cmake
diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
@@ -47,7 +47,6 @@ RUN cd /usr/src && \
     -DDEAL_II_WITH_TBB=ON \
     -DDEAL_II_WITH_TRILINOS=ON \
     -DDEAL_II_WITH_UMFPACK=ON \
-    -DDEAL_II_WITH_VTK=ON \
     -DDEAL_II_WITH_ZLIB=ON \
     .. \
     && ninja -j 2 install \

diff --git a/doc/doxygen/options.dox.in b/doc/doxygen/options.dox.in
@@ -249,7 +249,6 @@ PREDEFINED             = DOXYGEN=1 \
                          DEAL_II_TRILINOS_WITH_ZOLTAN=1 \
                          DEAL_II_TRILINOS_VERSION_GTE=1 \
                          DEAL_II_WITH_UMFPACK=1 \
-                         DEAL_II_WITH_VTK=1 \
                          DEAL_II_WITH_ZLIB=1
 
 # do not expand exception declarations

diff --git a/doc/users/cmake_dealii.html b/doc/users/cmake_dealii.html
@@ -477,7 +477,6 @@ <h3>Feature configuration</h3>
 DEAL_II_WITH_TBB
 DEAL_II_WITH_TRILINOS
 DEAL_II_WITH_UMFPACK
-DEAL_II_WITH_VTK
 DEAL_II_WITH_ZLIB
 </pre>
       They all have standard meanings with the exception of one:

diff --git a/doc/users/config.sample b/doc/users/config.sample
@@ -139,7 +139,6 @@
 # set(DEAL_II_WITH_TBB "ON" CACHE BOOL "")
 # set(DEAL_II_WITH_TRILINOS "ON" CACHE BOOL "")
 # set(DEAL_II_WITH_UMFPACK "ON" CACHE BOOL "")
-# set(DEAL_II_WITH_VTK "ON" CACHE BOOL "")
 # set(DEAL_II_WITH_ZLIB "ON" CACHE BOOL "")
 #
 

diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in
@@ -68,7 +68,6 @@
 #cmakedefine DEAL_II_WITH_TRILINOS
 #cmakedefine DEAL_II_WITH_UMFPACK
 #cmakedefine DEAL_II_FEATURE_UMFPACK_BUNDLED_CONFIGURED
-#cmakedefine DEAL_II_WITH_VTK
 #cmakedefine DEAL_II_WITH_ZLIB
 
 #ifdef DEAL_II_WITH_TBB

diff --git a/include/deal.II/vtk/utilities.h b/include/deal.II/vtk/utilities.h
diff --git a/tests/vtk/CMakeLists.txt b/tests/vtk/CMakeLists.txt
diff --git a/tests/vtk/vtk_01.cc b/tests/vtk/vtk_01.cc
diff --git a/tests/vtk/vtk_01.output b/tests/vtk/vtk_01.output