Porting to ParaView 5.8: additional changes

diff --git a/src/BasicGUI/CMakeLists.txt b/src/BasicGUI/CMakeLists.txt
index 13fc1f7c30b988c387e7bcc80c68e5240c68f8b7..fdaf1916319b5014f99b158159db25e23af416df 100644 (file)
--- a/src/BasicGUI/CMakeLists.txt
+++ b/src/BasicGUI/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/BooleanGUI/CMakeLists.txt b/src/BooleanGUI/CMakeLists.txt
index 639265b2f451239ab54f256d5492dce476172a17..b0d8fd81f360f5aca6677374859745836b818c0d 100644 (file)
--- a/src/BooleanGUI/CMakeLists.txt
+++ b/src/BooleanGUI/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/BuildGUI/CMakeLists.txt b/src/BuildGUI/CMakeLists.txt
index e2846e1c40aa2d1d1b4a5a036012dfa4c7b3c691..dcc984c80885b13d31b571f52e7523f5efe049ec 100644 (file)
--- a/src/BuildGUI/CMakeLists.txt
+++ b/src/BuildGUI/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/DisplayGUI/CMakeLists.txt b/src/DisplayGUI/CMakeLists.txt
index 8a55c207ed70e0549e9a5353e04d991b938a8c7f..1396dff2593c6dd10d384e88cb4d9bf7c4704801 100644 (file)
--- a/src/DisplayGUI/CMakeLists.txt
+++ b/src/DisplayGUI/CMakeLists.txt
@@ -22,7 +22,6 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${PTHREAD_INCLUDE_DIR}
-  ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${OpenCASCADE_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}

diff --git a/src/EntityGUI/CMakeLists.txt b/src/EntityGUI/CMakeLists.txt
index ec84ab9f9f9d9704397dfab05e08244a5817b19a..17ca641587f0bf6eed571d96adeca3393f64b459 100644 (file)
--- a/src/EntityGUI/CMakeLists.txt
+++ b/src/EntityGUI/CMakeLists.txt
@@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${PTHREAD_INCLUDE_DIR}
-  ${VTK_INCLUDE_DIRS}
   ${OPENCV_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
   ${OpenCASCADE_INCLUDE_DIR}

diff --git a/src/GEOMGUI/CMakeLists.txt b/src/GEOMGUI/CMakeLists.txt
index 17920cb246d0d28bc2dfc91a7050fb40f1fb1ef2..de4180d40e30a908df0313a43a726e6d082cbf76 100644 (file)
--- a/src/GEOMGUI/CMakeLists.txt
+++ b/src/GEOMGUI/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/GEOMToolsGUI/CMakeLists.txt b/src/GEOMToolsGUI/CMakeLists.txt
index 2100a00d4a5ef2faa4ba49054183da0ecfecc453..1c4103e3688c5da33ff7bff7daa303da9c34f936 100644 (file)
--- a/src/GEOMToolsGUI/CMakeLists.txt
+++ b/src/GEOMToolsGUI/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/GEOM_SWIG_WITHIHM/CMakeLists.txt b/src/GEOM_SWIG_WITHIHM/CMakeLists.txt
index cd2c18388aa10aa59c86ccfcb89d9a8ec999f1ac..d769e61bbc5ef2c33555d4f78578c4d2236c7455 100644 (file)
--- a/src/GEOM_SWIG_WITHIHM/CMakeLists.txt
+++ b/src/GEOM_SWIG_WITHIHM/CMakeLists.txt
@@ -25,7 +25,6 @@ INCLUDE(${SWIG_USE_FILE})
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
-  ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${OpenCASCADE_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}

diff --git a/src/GenerationGUI/CMakeLists.txt b/src/GenerationGUI/CMakeLists.txt
index 7a9f52929271c12a238b27152f91c99c99c952cb..3845852ac73181588dadd440465a6f0d9bdf38b8 100644 (file)
--- a/src/GenerationGUI/CMakeLists.txt
+++ b/src/GenerationGUI/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/GroupGUI/CMakeLists.txt b/src/GroupGUI/CMakeLists.txt
index 2e8d9f4a605ef50ee023e031585f695e9b1c0d6b..7a8dff5e4f99236040af90379666585d1ac35e13 100644 (file)
--- a/src/GroupGUI/CMakeLists.txt
+++ b/src/GroupGUI/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/Material/CMakeLists.txt b/src/Material/CMakeLists.txt
index e2ec5bf330d80c1777c64122eff64a8a284652a7..3aba92e153091f0b42de11c641dd08918a5cdd1f 100644 (file)
--- a/src/Material/CMakeLists.txt
+++ b/src/Material/CMakeLists.txt
@@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
-  ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${OpenCASCADE_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}

diff --git a/src/MeasureGUI/CMakeLists.txt b/src/MeasureGUI/CMakeLists.txt
index b414c42a43b2cd358dec2f5a5ee951b529656dbd..5bda2362a836944a6867a14266525e3f63354804 100644 (file)
--- a/src/MeasureGUI/CMakeLists.txt
+++ b/src/MeasureGUI/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/OBJECT/CMakeLists.txt b/src/OBJECT/CMakeLists.txt
index da54f284f92bb13bf2a9e0fe3783f7d3a9f14cbd..d53478f177c8eee8236e587fa5329e9c910e022d 100644 (file)
--- a/src/OBJECT/CMakeLists.txt
+++ b/src/OBJECT/CMakeLists.txt
@@ -17,8 +17,6 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-find_package(ParaView REQUIRED)
-
 # --- options ---
 
 # additional include directories
@@ -51,7 +49,6 @@ SET(_link_LIBRARIES
   ${KERNEL_SALOMELocalTrace}
   ${GUI_SVTK}
   ${QT_QTCORE_LIBRARY}
-  ParaView::pqApplicationComponents
   VTK::RenderingMatplotlib
   VTK::InteractionStyle
   VTK::IOLegacy

diff --git a/src/OperationGUI/CMakeLists.txt b/src/OperationGUI/CMakeLists.txt
index 6a8f9cfd4ff0cbe1e51415a2bd4923514c6a7ebd..3fcc1e47584a0fcc7e26bfcafc0db1260ea64f89 100644 (file)
--- a/src/OperationGUI/CMakeLists.txt
+++ b/src/OperationGUI/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/PrimitiveGUI/CMakeLists.txt b/src/PrimitiveGUI/CMakeLists.txt
index c9fda349836e87202b682a153db8a7b2dd7958d1..3d0dc72e0355b597a7ec67c2753e41885e65229b 100644 (file)
--- a/src/PrimitiveGUI/CMakeLists.txt
+++ b/src/PrimitiveGUI/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/RepairGUI/CMakeLists.txt b/src/RepairGUI/CMakeLists.txt
index a8e4a1587cc66dbf3d2ed55661eaecd97c530627..af93e5705a2f58e0d99650a3c02245f6158e4c2d 100644 (file)
--- a/src/RepairGUI/CMakeLists.txt
+++ b/src/RepairGUI/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/TransformationGUI/CMakeLists.txt b/src/TransformationGUI/CMakeLists.txt
index b85595e6a52aeeceea3f5e3ee9785274ea395861..4c640ff19bf98e9c421ef45bb2294447b02008b1 100644 (file)
--- a/src/TransformationGUI/CMakeLists.txt
+++ b/src/TransformationGUI/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}