Port to ParaView 5.8.

diff --git a/cmake/FindSalomeParaView.cmake b/cmake/FindSalomeParaView.cmake
index d97e8f64bc459892ba5fd1436859ee1c835d06de..4b2d03b4b19629d73c41f0fc3b170da57d6d3abd 100644 (file)
--- a/cmake/FindSalomeParaView.cmake
+++ b/cmake/FindSalomeParaView.cmake
@@ -34,6 +34,9 @@ ELSE()
   SET(PARAVIEW_QT_VERSION "5")
 ENDIF()
 
-SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(ParaView PARAVIEW_USE_FILE 4)
+# SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(ParaView PARAVIEW_USE_FILE 4)
+find_package(ParaView REQUIRED)
 
-INCLUDE(${PARAVIEW_USE_FILE})
+#MESSAGE(STATUS "PUF ${PARAVIEW_USE_FILE}")
+#INCLUDE(${PARAVIEW_USE_FILE})
+# This was /home/pascal/dev/build-salome-v94/paraview/build/install/lib/cmake/paraview-5.6/UseParaView.cmake

diff --git a/cmake/FindSalomeVTK.cmake b/cmake/FindSalomeVTK.cmake
index 4e70438adf503d8b4613d38e4b3ee4b22e97c0d5..4c58cd5f171d6d122bb5b2626e48385b2354be98 100644 (file)
--- a/cmake/FindSalomeVTK.cmake
+++ b/cmake/FindSalomeVTK.cmake
@@ -50,11 +50,11 @@ 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]*")
+  FILE(GLOB VTK_DIR "${PARAVIEW_ROOT_DIR}/lib/cmake/paraview-[1-9].[0-9]*/vtk")
   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_INCLUDE_DIRS 2)
 MARK_AS_ADVANCED(VTK_DIR)
 
 IF(VTK_FOUND)

diff --git a/cmake/SalomeMacros.cmake b/cmake/SalomeMacros.cmake
index 64c10addb359b3e7a2f34a575f7bbe700faa32e4..e1a6d35a9fa2288136dda1ddb692784ce7f01ebb 100644 (file)
--- a/cmake/SalomeMacros.cmake
+++ b/cmake/SalomeMacros.cmake
@@ -573,7 +573,7 @@ MACRO(SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS pkg referenceVariable upCount)
        #  Note the double de-reference of "referenceVariable":
        SET(_tmp_ROOT_DIR "${${referenceVariable}}")
     ENDIF()
-    # Up cound can be reset by detection procedure
+    # Up count can be reset by detection procedure
     SET(_upCount ${upCount})
     IF(DEFINED ${pkg_UC}_UPCOUNT)
       SET(_upCount ${${pkg_UC}_UPCOUNT})
@@ -746,9 +746,9 @@ MACRO(SALOME_ACCUMULATE_ENVIRONMENT envvar)
     ELSE()
       IF(_is_check)
         IF(NOT IS_DIRECTORY ${_item})
-          IF(TARGET ${_item})
-            GET_TARGET_PROPERTY(_item ${_item} LOCATION)
-          ENDIF()        
+#          IF(TARGET ${_item})
+#            GET_TARGET_PROPERTY(_item ${_item} LOCATION)
+#          ENDIF()        
           GET_FILENAME_COMPONENT(_item ${_item} PATH)
         ENDIF()    
         IF(EXISTS ${_item})