Porting to ParaView 5.8

[tools/configuration.git] / cmake / FindSalomeVTK.cmake

diff --git a/cmake/FindSalomeVTK.cmake b/cmake/FindSalomeVTK.cmake
index 4e70438adf503d8b4613d38e4b3ee4b22e97c0d5..5389e458d9495939049435f297741ac1768cd7f4 100644 (file)
--- a/cmake/FindSalomeVTK.cmake
+++ b/cmake/FindSalomeVTK.cmake
@@ -25,19 +25,18 @@
 #
 
 # List the required components:
-SET(SalomeVTK_COMPONENTS 
-  vtkRenderingLOD 
-  vtkRenderingAnnotation 
-  vtkFiltersParallel
-  vtkIOExport
-  vtkWrappingPythonCore  ## ParaView 4.0.1
-  #vtkWrappingPython
-  vtkIOXML
-  vtkFiltersVerdict
-  vtkRenderingLabel
-  vtkInteractionWidgets
-  vtkInfovisCore
-  vtkInteractionStyle
+SET(SalomeVTK_COMPONENTS
+  RenderingLOD 
+  RenderingAnnotation 
+  FiltersParallel
+  IOExport
+  WrappingPythonCore  ## ParaView 4.0.1
+  IOXML
+  FiltersVerdict
+  RenderingLabel
+  InteractionWidgets
+  InfovisCore
+  InteractionStyle
 )
 
 #   Seting the following variable is equivalent to having passed the components
@@ -49,21 +48,22 @@ SET(PARAVIEW_ROOT_DIR "$ENV{PARAVIEW_ROOT_DIR}" CACHE PATH "Path to the ParaView
 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-[1-9].[0-9]*")
+  # Extract VTK configuration directory from Paraview:
+  FILE(GLOB VTK_DIR "${PARAVIEW_ROOT_DIR}/lib/cmake/paraview-[1-9].[0-9]*/vtk")
+  IF(NOT VTK_DIR)
+    FILE(GLOB VTK_DIR "${PARAVIEW_ROOT_DIR}/lib64/cmake/paraview-[1-9].[0-9]*/vtk")
+  ENDIF()
   MESSAGE(STATUS "Setting VTK_DIR to: ${VTK_DIR}") 
 ENDIF()
 
-SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(VTK VTK_INCLUDE_DIRS 2)
+SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(VTK VTK_PREFIX_PATH 0)
 MARK_AS_ADVANCED(VTK_DIR)
 
 IF(VTK_FOUND)
   MESSAGE(STATUS "VTK version is ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}")
-  #MESSAGE(STATUS "VTK libraries are: ${VTK_LIBRARIES}")
 ENDIF()
 
 IF(VTK_FOUND) 
-  SALOME_ACCUMULATE_HEADERS(VTK_INCLUDE_DIRS)
   SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${VTK_LIBRARIES})
   SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH ${VTK_LIBRARIES})
   SALOME_ACCUMULATE_ENVIRONMENT(PV_PLUGIN_PATH ${VTK_LIBRARIES})