summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-10-02 09:25:44 -0400
committerBrad King <brad.king@kitware.com>2014-10-02 09:28:02 -0400
commit5b5e80e7288b42b1221b374c86e6ece39853c3bd (patch)
tree1acda4334456de0f1de7730b9de498121788fc96
parentfd6fa6572665d461a0a6f4fd5354f8ace71ad2b2 (diff)
downloadcmake-5b5e80e7288b42b1221b374c86e6ece39853c3bd.tar.gz
FindVTK: Drop this ancient compatibility module
The FindVTK module only existed to help find_package(VTK) calls work in old projects written to use "USE_VTK_FILE" instead of "VTK_USE_FILE". Drop it to allow find_package(VTK) calls to search for VTKConfig.cmake directly.
-rw-r--r--Help/module/FindVTK.rst11
-rw-r--r--Modules/FindVTK.cmake66
2 files changed, 10 insertions, 67 deletions
diff --git a/Help/module/FindVTK.rst b/Help/module/FindVTK.rst
index f9c1efe5f8..3bc67c5c9e 100644
--- a/Help/module/FindVTK.rst
+++ b/Help/module/FindVTK.rst
@@ -1 +1,10 @@
-.. cmake-module:: ../../Modules/FindVTK.cmake
+FindVTK
+-------
+
+This module no longer exists.
+
+This module existed in versions of CMake prior to 3.1, but became
+only a thin wrapper around ``find_package(VTK NO_MODULE)`` to
+provide compatibility for projects using long-outdated conventions.
+Now ``find_package(VTK)`` will search for ``VTKConfig.cmake``
+directly.
diff --git a/Modules/FindVTK.cmake b/Modules/FindVTK.cmake
deleted file mode 100644
index 60f48dd406..0000000000
--- a/Modules/FindVTK.cmake
+++ /dev/null
@@ -1,66 +0,0 @@
-#.rst:
-# FindVTK
-# -------
-#
-# Find a VTK installation or build tree.
-#
-# The following variables are set if VTK is found. If VTK is not found,
-# VTK_FOUND is set to false.
-#
-# ::
-#
-# VTK_FOUND - Set to true when VTK is found.
-#
-# The following cache entries must be set by the user to locate VTK:
-#
-# ::
-#
-# VTK_DIR - The directory containing VTKConfig.cmake.
-# This is either the root of the build tree,
-# or the lib/vtk directory. This is the
-# only cache entry.
-#
-# The following variables are set for backward compatibility and should
-# not be used in new code:
-#
-# ::
-#
-# USE_VTK_FILE - The full path to the UseVTK.cmake file.
-# This is provided for backward
-# compatibility. Use VTK_USE_FILE
-# instead.
-
-#=============================================================================
-# Copyright 2001-2014 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-# License text for the above reference.)
-
-# Use the Config mode of the find_package() command to find VTKConfig.
-# If this succeeds (possibly because VTK_DIR is already set), the
-# command will have already loaded VTKConfig.cmake and set VTK_FOUND.
-if(NOT VTK_FOUND)
- set(_VTK_REQUIRED "")
- if(VTK_FIND_REQUIRED)
- set(_VTK_REQUIRED REQUIRED)
- endif()
- set(_VTK_QUIET "")
- if(VTK_FIND_QUIETLY)
- set(_VTK_QUIET QUIET)
- endif()
- find_package(VTK ${_VTK_REQUIRED} ${_VTK_QUIET} NO_MODULE)
- unset(_VTK_REQUIRED)
- unset(_VTK_QUIET)
-endif()
-
-if(VTK_FOUND)
- # Set USE_VTK_FILE for backward-compatibility.
- set(USE_VTK_FILE ${VTK_USE_FILE})
-endif()