Merge branch 'master' into agr/start_procedure

[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 3733186ed9932f0a60323ee4f756ba54fb274cbf..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,8 +31,8 @@ SET(SalomeVTK_COMPONENTS
   vtkRenderingAnnotation 
   vtkFiltersParallel
   vtkIOExport
-  #vtkWrappingPythonCore  ## ParaView 4.0.1
-  vtkWrappingPython
+  vtkWrappingPythonCore  ## ParaView 4.0.1
+  #vtkWrappingPython
   vtkIOXML
   vtkFiltersVerdict
   vtkRenderingLabel
@@ -50,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()