From 086c76ebb6ec24c47da98e879d5e28c7e9ddb189 Mon Sep 17 00:00:00 2001 From: vtn Date: Mon, 25 Feb 2013 14:46:43 +0000 Subject: [PATCH] Porting to Paraview 3.98.1 --- adm_local/cmake_files/FindVTK.cmake | 52 ++--------------------------- 1 file changed, 3 insertions(+), 49 deletions(-) diff --git a/adm_local/cmake_files/FindVTK.cmake b/adm_local/cmake_files/FindVTK.cmake index 4e0871c89..ee3b3b99d 100644 --- a/adm_local/cmake_files/FindVTK.cmake +++ b/adm_local/cmake_files/FindVTK.cmake @@ -17,52 +17,6 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(FindVTK) - -SET(VTK_INCLUDES) -FOREACH(dir ${VTK_INCLUDE_DIRS}) - SET(VTK_INCLUDES ${VTK_INCLUDES} -I${dir}) -ENDFOREACH(dir ${VTK_INCLUDE_DIRS}) - -SET(VTK_LIBS) -FIND_LIBRARY(VTK_COMMON vtkCommon PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) -SET(VTK_LIBS ${VTK_LIBS} ${VTK_COMMON}) -FIND_LIBRARY(VTK_GRAPHICS vtkGraphics PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) -SET(VTK_LIBS ${VTK_LIBS} ${VTK_GRAPHICS}) -FIND_LIBRARY(VTK_IMAGING vtkImaging PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) -SET(VTK_LIBS ${VTK_LIBS} ${VTK_IMAGING}) -FIND_LIBRARY(VTK_FILTERING vtkFiltering PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) -SET(VTK_LIBS ${VTK_LIBS} ${VTK_FILTERING}) -FIND_LIBRARY(VTK_IO vtkIO PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) -SET(VTK_LIBS ${VTK_LIBS} ${VTK_IO}) -FIND_LIBRARY(VTK_RENDERING vtkRendering PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) -SET(VTK_LIBS ${VTK_LIBS} ${VTK_RENDERING}) -FIND_LIBRARY(VTK_HYBRID vtkHybrid PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) -SET(VTK_LIBS ${VTK_LIBS} ${VTK_HYBRID}) -FIND_LIBRARY(VTK_PARALLEL vtkParallel PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) -SET(VTK_LIBS ${VTK_LIBS} ${VTK_PARALLEL}) -FIND_LIBRARY(VTK_WIDGETS vtkWidgets PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) -SET(VTK_LIBS ${VTK_LIBS} ${VTK_WIDGETS}) -FIND_LIBRARY(VTK_GENERIC_FILTERING vtkGenericFiltering PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) -SET(VTK_LIBS ${VTK_LIBS} ${VTK_GENERIC_FILTERING}) -FIND_LIBRARY(VTK_INFOVIS vtkInfovis PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) -SET(VTK_LIBS ${VTK_LIBS} ${VTK_INFOVIS}) -FIND_LIBRARY(VTK_VOLUME_RENDERING vtkVolumeRendering PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) -SET(VTK_LIBS ${VTK_LIBS} ${VTK_VOLUME_RENDERING}) - -FIND_LIBRARY(vtkCommonPythonD vtkCommonPythonD PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) -FIND_LIBRARY(vtkGraphicsPythonD vtkGraphicsPythonD PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) -FIND_LIBRARY(vtkImagingPythonD vtkImagingPythonD PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) -FIND_LIBRARY(vtkPythonCore vtkPythonCore PATHS ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH) - - -#IF(NOT WINDOWS) -# IF(VTK_MAJOR_VERSION STREQUAL 5) -# IF(VTK_MINOR_VERSION STREQUAL 0) -# SET(VTK_INCLUDES ${VTK_INCLUDES} -Wno-deprecated) -# ENDIF(VTK_MINOR_VERSION STREQUAL 0) -# ENDIF(VTK_MAJOR_VERSION STREQUAL 5) -#ENDIF(NOT WINDOWS) - -SET(VTK_INCLUDES ${VTK_INCLUDES} -DVTK_EXCLUDE_STRSTREAM_HEADERS) -SET(VTK_DEFINITIONS -DVTK_EXCLUDE_STRSTREAM_HEADERS) \ No newline at end of file +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7 FATAL_ERROR) +FIND_PACKAGE(VTK 6.0 REQUIRED NO_MODULE) +INCLUDE(${VTK_USE_FILE}) -- 2.39.2