Commit 0625ee12 authored by Andreas Beckmann's avatar Andreas Beckmann

fix FTBFS with CMake 3.2

parent cf9614e0
ifrit (3.4.2-2) UNRELEASED; urgency=medium
* QA upload.
* Use the CMake 3.2 way to find VTK. (Closes: #788766)
-- Andreas Beckmann <anbe@debian.org> Sat, 18 Jul 2015 17:20:15 +0200
ifrit (3.4.2-1) unstable; urgency=low
* QA upload.
......
Author: Andreas Beckmann <anbe@debian.org>
Description: fix FTBFS with CMake 3.2
from /usr/share/cmake-3.2/Help/module/FindVTK.rst:
.
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.
Bug-Debian: #788766
--- a/build/CMakeLists.txt
+++ b/build/CMakeLists.txt
@@ -135,11 +135,12 @@ IF(Shell:CL)
ENDIF(Shell:CL)
# Find VTK
-SET(VTK_DIR $ENV{VTKDIR})
-INCLUDE(${CMAKE_ROOT}/Modules/FindVTK.cmake)
-IF(NOT VTK_FOUND)
- MESSAGE(FATAL_ERROR "VTK is not found. Please check that VTKDIR variables is set properly.")
-ENDIF(NOT VTK_FOUND)
+#SET(VTK_DIR $ENV{VTKDIR})
+#INCLUDE(${CMAKE_ROOT}/Modules/FindVTK.cmake)
+#IF(NOT VTK_FOUND)
+# MESSAGE(FATAL_ERROR "VTK is not found. Please check that VTKDIR variables is set properly.")
+#ENDIF(NOT VTK_FOUND)
+find_package(VTK)
INCLUDE(${VTK_USE_FILE})
IF(VTK_USE_VOLUMEPRO AND VTK_HAVE_VP1000)
03-link-gl.patch
cmake-3.2.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment