Merge branch 'master' into V7_5_BR

[modules/kernel.git] / salome_adm / cmake_files / FindSalomeVTK.cmake

diff --git a/salome_adm/cmake_files/FindSalomeVTK.cmake b/salome_adm/cmake_files/FindSalomeVTK.cmake
index 24fe201c3a9205959b9445d976451fbfca319e70..1ab47d1245fddc1f92121696e0a82e5934273bb9 100644 (file)
--- a/salome_adm/cmake_files/FindSalomeVTK.cmake
+++ b/salome_adm/cmake_files/FindSalomeVTK.cmake
@@ -1,9 +1,9 @@
-# Copyright (C) 2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2014  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.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,10 +31,13 @@ SET(SalomeVTK_COMPONENTS
   vtkRenderingAnnotation 
   vtkFiltersParallel
   vtkIOExport
-  #vtkWrappingPythonCore  ## ParaView 4.0.1
-  vtkWrappingPython
+  vtkWrappingPythonCore  ## ParaView 4.0.1
+  #vtkWrappingPython
   vtkIOXML
   vtkFiltersVerdict
+  vtkRenderingLabel
+  vtkInteractionWidgets
+  vtkInfovisCore
 )
 
 #   Seting the following variable is equivalent to having passed the components
@@ -47,7 +50,7 @@ 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-*")
+  FILE(GLOB VTK_DIR "${PARAVIEW_ROOT_DIR}/lib/cmake/paraview-[1-9].[0-9]*")
   MESSAGE(STATUS "Setting VTK_DIR to: ${VTK_DIR}") 
 ENDIF()
 
@@ -61,10 +64,7 @@ ENDIF()
 
 IF(VTK_FOUND) 
   SALOME_ACCUMULATE_HEADERS(VTK_INCLUDE_DIRS)
-  SALOME_ACCUMULATE_ENVIRONMENT(PATH ${PARAVIEW_ROOT_DIR}/bin)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${PARAVIEW_ROOT_DIR}/lib/paraview-3.98)
-  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${PARAVIEW_ROOT_DIR}/lib/paraview-3.98
-                                           ${PARAVIEW_ROOT_DIR}/lib/paraview-3.98/site-packages
-                                           ${PARAVIEW_ROOT_DIR}/lib/paraview-3.98/site-packages/paraview)
-  SALOME_ACCUMULATE_ENVIRONMENT(PV_PLUGIN_PATH ${PARAVIEW_ROOT_DIR}/lib/paraview-3.98)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${VTK_LIBRARIES})
+  SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${VTK_LIBRARIES})
+  SALOME_ACCUMULATE_ENVIRONMENT(PV_PLUGIN_PATH ${VTK_LIBRARIES})
 ENDIF()