From d290dd2506ddef03928fbb6259dfb780f650bb1e Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 28 Jun 2023 11:05:46 -0500 Subject: [PATCH] CMake: remove VTK configure option Our CMake configure for VTK isn't quite prime-time ready. Given the fact that we currently only support a very minimal infrastructure, let's just remove the configure option for the release. Acked-by: Luca Heltai --- cmake/configure/configure_50_vtk.cmake | 20 -------- cmake/modules/FindDEAL_II_VTK.cmake | 65 -------------------------- contrib/docker/Dockerfile | 1 - 3 files changed, 86 deletions(-) delete mode 100644 cmake/configure/configure_50_vtk.cmake delete mode 100644 cmake/modules/FindDEAL_II_VTK.cmake diff --git a/cmake/configure/configure_50_vtk.cmake b/cmake/configure/configure_50_vtk.cmake deleted file mode 100644 index 8ceac4ca56..0000000000 --- a/cmake/configure/configure_50_vtk.cmake +++ /dev/null @@ -1,20 +0,0 @@ -## --------------------------------------------------------------------- -## -## Copyright (C) 2012 - 2023 by the deal.II authors -## -## This file is part of the deal.II library. -## -## The deal.II library is free software; you can use it, redistribute -## it, and/or modify it under the terms of the GNU Lesser General -## Public License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## The full text of the license can be found in the file LICENSE.md at -## the top level directory of deal.II. -## -## --------------------------------------------------------------------- - -# -# Configuration for the VTK library: -# - -configure_feature(VTK) diff --git a/cmake/modules/FindDEAL_II_VTK.cmake b/cmake/modules/FindDEAL_II_VTK.cmake deleted file mode 100644 index 49a8035d1e..0000000000 --- a/cmake/modules/FindDEAL_II_VTK.cmake +++ /dev/null @@ -1,65 +0,0 @@ -## --------------------------------------------------------------------- -## -## Copyright (C) 2023 by the deal.II authors -## -## This file is part of the deal.II library. -## -## The deal.II library is free software; you can use it, redistribute -## it, and/or modify it under the terms of the GNU Lesser General -## Public License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## The full text of the license can be found in the file LICENSE.md at -## the top level directory of deal.II. -## -## --------------------------------------------------------------------- - -# -# Try to find the VTK libraries -# -# This module exports: -# -# VTK_INCLUDE_DIR -# VTK_VERSION_MAJOR -# VTK_VERSION_MINOR -# VTK_LIBRARIES -# - -set(VTK_DIR "" CACHE PATH "An optional hint to a VTK installation") -set_if_empty(VTK_DIR "$ENV{VTK_DIR}") - -if(NOT "${VTK_DIR}" STREQUAL "") - set(VTK_DIR ${VTK_DIR}) -endif() - -find_package(VTK 9.0.0 QUIET HINTS ${VTK_DIR}) - -if(VTK_FOUND) - set(VTK_VERSION "${VTK_VERSION}") - set(VTK_MAJOR_VERSION "${VTK_MAJOR_VERSION}") - set(VTK_MINOR_VERSION "${VTK_MINOR_VERSION}") - - set(VTK_INCLUDE_DIR - ${VTK_PREFIX_PATH}/include/vtk-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}) - - # Try to find full paths from targets contained in VTK_LIBRARIES. - set(_libraries) - foreach(_library ${VTK_LIBRARIES}) - if(NOT ${_library} MATCHES "Python" - AND NOT ${_library} MATCHES "MPI4Py") - get_target_property(_configurations ${_library} IMPORTED_CONFIGURATIONS) - - if(_configurations) - foreach(_configuration ${_configurations}) - get_target_property(_imported_location ${_library} IMPORTED_LOCATION_${_configuration}) - list(APPEND _libraries ${_imported_location}) - endforeach() - endif() - endif() - endforeach() -endif() - -process_feature(VTK - LIBRARIES REQUIRED _libraries - INCLUDE_DIRS REQUIRED VTK_INCLUDE_DIR - CLEAR VTK_INCLUDE_DIR VTK_LIBRARIES _libraries -) diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index 4cebdaf2ae..2893cd2cfb 100644 --- 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 \ -- 2.39.5