From: rnv <rnv@opencascade.com>
Date: Thu, 10 Oct 2013 12:42:42 +0000 (+0000)
Subject: Move VTK cmake configuration file from GUI module to the KERNEL: it is used in GEOM... 
X-Git-Tag: BR_hydro_v_0_3_1~47
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4106703754314f4d5ed6d6a25dfc107d8cdb02e0;p=modules%2Fgui.git

Move VTK cmake configuration file from GUI module to the KERNEL: it is used in GEOM WITHOUT GUI, SMESH WITHOUT GUI, ... configurations.
---

diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt
index 8e2b58b60..3ff0b9d65 100755
--- a/adm_local/cmake_files/CMakeLists.txt
+++ b/adm_local/cmake_files/CMakeLists.txt
@@ -33,7 +33,6 @@ SET(_adm_data
   FindSalomeQt4.cmake
   FindSalomeQwt.cmake
   FindSalomeSIP.cmake
-  FindSalomeVTK.cmake
   FindSalomeGUI.cmake
   FindSalomeOpenGL.cmake
   UsePyQt4.cmake
diff --git a/adm_local/cmake_files/FindSalomeVTK.cmake b/adm_local/cmake_files/FindSalomeVTK.cmake
deleted file mode 100644
index b2a98adf6..000000000
--- a/adm_local/cmake_files/FindSalomeVTK.cmake
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (C) 2013  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# This library is free software; you can 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.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-# Author: Adrien Bruneton
-#
-
-# VTK detection for Salome (see http://www.vtk.org/Wiki/VTK/Build_System_Migration)
-#
-#  !! Please read the generic detection procedure in SalomeMacros.cmake !!
-#
-
-# List the required components:
-#   Seting the following variable is equivalent to having passed the components
-#   when calling the FIND_PACKAGE() command.
-SET(SalomeVTK_FIND_COMPONENTS 
-  vtkRenderingFreeTypeOpenGL
-  vtkRenderingLOD 
-  vtkRenderingAnnotation 
-  vtkFiltersParallel
-  vtkIOExport
-  #vtkWrappingPythonCore  ## ParaView 4.0.1
-  vtkWrappingPython
-  vtkIOXML
-)
-
-# If no VTK root dir is specified, try the ParaView root dir:
-SET(PARAVIEW_ROOT_DIR "$ENV{PARAVIEW_ROOT_DIR}" CACHE PATH "Path to the ParaView installation")
-IF(EXISTS "${PARAVIEW_ROOT_DIR}" AND (NOT VTK_ROOT_DIR))
-  MESSAGE(STATUS "Looking for VTK in the ParaView installation (PARAVIEW_ROOT_DIR exists and VTK_ROOT_DIR is not defined) ...")
-  
-  # Extract sub-directory "paraview-x.xx":
-  FILE(GLOB VTK_DIR "${PARAVIEW_ROOT_DIR}/lib/cmake/paraview-*")
-  MESSAGE(STATUS "Setting VTK_DIR to: ${VTK_DIR}") 
-ENDIF()
-
-SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(VTK VTK_INCLUDE_DIRS 2)
-MARK_AS_ADVANCED(VTK_DIR)
-
-SALOME_ACCUMULATE_HEADERS(VTK_INCLUDE_DIRS)
-
-IF(VTK_FOUND)
-  MESSAGE(STATUS "VTK version is ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}")
-  #MESSAGE(STATUS "VTK libraries are: ${VTK_LIBRARIES}")
-ENDIF()