Port GEOM to new ParaView 5.8.

diff --git a/src/AdvancedGUI/CMakeLists.txt b/src/AdvancedGUI/CMakeLists.txt
index 80ab33ae3b7f2df36a82588db6c9178fa3e971ab..11b53989c2039592d5c2e43e06aeca4a88363eef 100644 (file)
--- a/src/AdvancedGUI/CMakeLists.txt
+++ b/src/AdvancedGUI/CMakeLists.txt
@@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${PTHREAD_INCLUDE_DIR}
-  ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${OpenCASCADE_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}

diff --git a/src/BlocksGUI/CMakeLists.txt b/src/BlocksGUI/CMakeLists.txt
index 15d709990f8712b6b84d1787956a9ea7c3a58441..a03271d32d6f3472e7315d0729c5fc87d47cbfc8 100644 (file)
--- a/src/BlocksGUI/CMakeLists.txt
+++ b/src/BlocksGUI/CMakeLists.txt
@@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${PTHREAD_INCLUDE_DIR}
-  ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${OpenCASCADE_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}

diff --git a/src/DependencyTree/CMakeLists.txt b/src/DependencyTree/CMakeLists.txt
index 417be383faa16ce5038cec0b8c80aec952d07351..47f8cdacea8163184d8fe4a555dea9797cc8072d 100644 (file)
--- a/src/DependencyTree/CMakeLists.txt
+++ b/src/DependencyTree/CMakeLists.txt
@@ -49,7 +49,6 @@ ENDIF(WIN32)
 # libraries to link to
 SET(_link_LIBRARIES
   ${QT_LIBRARIES}
-  ${GUI_SalomeApp}
   ${GUI_GraphicsView}
   GEOM
   GEOMBase

diff --git a/src/DlgRef/CMakeLists.txt b/src/DlgRef/CMakeLists.txt
index 0d1b8790d6f99dd7f221d6a0a8c116025d55196e..9fb0e25415f640d87afe3a5119e3abb7b157dc5f 100644 (file)
--- a/src/DlgRef/CMakeLists.txt
+++ b/src/DlgRef/CMakeLists.txt
@@ -36,7 +36,6 @@ ADD_DEFINITIONS(
 # libraries to link to
 SET(_link_LIBRARIES
   ${QT_LIBRARIES}
-  ${GUI_SalomeApp}
   )
 
 # --- resources ---

diff --git a/src/GEOMBase/CMakeLists.txt b/src/GEOMBase/CMakeLists.txt
index 99b94cd16feeb4db383a0ef7d81a968a187f1950..baeb178ee0e510c253fd6c2f1b861129806e8b48 100644 (file)
--- a/src/GEOMBase/CMakeLists.txt
+++ b/src/GEOMBase/CMakeLists.txt
@@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${PTHREAD_INCLUDE_DIR}
-  ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${OpenCASCADE_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
@@ -55,7 +54,6 @@ SET(_link_LIBRARIES
   GEOM
   DlgRef
   ${KERNEL_SALOMELocalTrace}
-  ${GUI_SalomeApp}
   )
 
 # --- headers ---

diff --git a/src/GEOMFiltersSelection/CMakeLists.txt b/src/GEOMFiltersSelection/CMakeLists.txt
index 78771cc7539d895c60e0b1dfb1f4f3f4afb9e56d..37c0c1124a346d03d1c9e3ca9d23f400fef86a4c 100644 (file)
--- a/src/GEOMFiltersSelection/CMakeLists.txt
+++ b/src/GEOMFiltersSelection/CMakeLists.txt
@@ -45,7 +45,6 @@ SET(_link_LIBRARIES
   GEOMClient
   ${OpenCASCADE_ModelingData_LIBRARIES}
   ${KERNEL_SALOMELocalTrace}
-  ${GUI_SalomeApp}
   )
 
 # --- headers ---

diff --git a/src/GEOMGUI/CMakeLists.txt b/src/GEOMGUI/CMakeLists.txt
index 7bb13b9ee62c5a8f1edd21813dd5b3db7c7d4192..17920cb246d0d28bc2dfc91a7050fb40f1fb1ef2 100644 (file)
--- a/src/GEOMGUI/CMakeLists.txt
+++ b/src/GEOMGUI/CMakeLists.txt
@@ -59,7 +59,6 @@ SET(_link_LIBRARIES
   ${KERNEL_SALOMELocalTrace}
   ${KERNEL_SalomeDS}
   ${KERNEL_SalomeDSClient}
-  ${GUI_SalomeApp}
   )
 
 # --- headers ---

diff --git a/src/Material/CMakeLists.txt b/src/Material/CMakeLists.txt
index 0156d1abffa11c460f8a0fddbd30717b5f3dd97f..e2ec5bf330d80c1777c64122eff64a8a284652a7 100644 (file)
--- a/src/Material/CMakeLists.txt
+++ b/src/Material/CMakeLists.txt
@@ -48,7 +48,6 @@ SET(_link_LIBRARIES
   GEOMClient
   ${OpenCASCADE_ModelingData_LIBRARIES}
   ${KERNEL_SALOMELocalTrace}
-  ${GUI_SalomeApp}
   )
 
 # --- headers ---

diff --git a/src/OBJECT/CMakeLists.txt b/src/OBJECT/CMakeLists.txt
index 2de75adc5f4982c3b74526876520aac3cb99595a..295cd1c85f1d46b345c11d9a2ddf3e1b29103d18 100644 (file)
--- a/src/OBJECT/CMakeLists.txt
+++ b/src/OBJECT/CMakeLists.txt
@@ -17,13 +17,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${VTK_USE_FILE})
+find_package(ParaView REQUIRED)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${VTK_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
   ${OpenCASCADE_INCLUDE_DIR}
@@ -50,13 +49,12 @@ SET(_link_LIBRARIES
   ${OpenCASCADE_ModelingData_LIBRARIES}
   ${OpenCASCADE_Visualization_LIBRARIES}
   ${KERNEL_SALOMELocalTrace}
-  ${GUI_SalomeObject}
   ${GUI_SVTK}
   ${QT_QTCORE_LIBRARY}
-  vtkRenderingMatplotlib
-  vtkInteractionStyle
+  ParaView::pqApplicationComponents
+  VTK::RenderingMatplotlib
+  VTK::InteractionStyle
   GEOMUtils
-  #${VTK_LIBRARIES}
   )
 
 # --- headers ---

diff --git a/src/OCC2VTK/CMakeLists.txt b/src/OCC2VTK/CMakeLists.txt
index 830f1dc08c7f0bf0bbb60afc562af2cfc0936314..1a20f347b1a878af67120fd416641c0534c35ba1 100644 (file)
--- a/src/OCC2VTK/CMakeLists.txt
+++ b/src/OCC2VTK/CMakeLists.txt
@@ -23,7 +23,6 @@
 INCLUDE_DIRECTORIES(
   ${OpenCASCADE_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
-  ${VTK_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${PROJECT_SOURCE_DIR}/src/GEOMUtils
   )
@@ -35,7 +34,7 @@ ADD_DEFINITIONS(
 
 # libraries to link to
 SET(_link_LIBRARIES
-  vtkFiltersCore
+  VTK::FiltersCore
   ${OpenCASCADE_FoundationClasses_LIBRARIES}
   ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
   ${KERNEL_SALOMELocalTrace}

diff --git a/src/VTKPlugin/CMakeLists.txt b/src/VTKPlugin/CMakeLists.txt
index 423d9c90c2c346e5c8d7403f58385fc9a9fe7fca..6bbacaa7f149e876c0500ee5687571fdfe9cd772 100644 (file)
--- a/src/VTKPlugin/CMakeLists.txt
+++ b/src/VTKPlugin/CMakeLists.txt
@@ -26,7 +26,6 @@ ENDIF()
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${OpenCASCADE_INCLUDE_DIR}
-  ${VTK_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}/idl
   ${PROJECT_SOURCE_DIR}/src/GEOMAlgo
@@ -71,7 +70,7 @@ SET(_link_engine_LIBRARIES
   SalomeIDLVTKPlugin
   GEOMEngine
   GEOMClient
-  vtkIOLegacy
+  VTK::IOLegacy
   OCC2VTK
   )