From a00e0f1e4951885b8c14c859bc50859edc4dec98 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 28 Feb 2020 09:07:51 +0300 Subject: [PATCH] Porting to ParaView 5.8: additional changes --- src/BasicGUI/CMakeLists.txt | 1 - src/BooleanGUI/CMakeLists.txt | 1 - src/BuildGUI/CMakeLists.txt | 1 - src/DisplayGUI/CMakeLists.txt | 1 - src/EntityGUI/CMakeLists.txt | 1 - src/GEOMGUI/CMakeLists.txt | 1 - src/GEOMToolsGUI/CMakeLists.txt | 1 - src/GEOM_SWIG_WITHIHM/CMakeLists.txt | 1 - src/GenerationGUI/CMakeLists.txt | 1 - src/GroupGUI/CMakeLists.txt | 1 - src/Material/CMakeLists.txt | 1 - src/MeasureGUI/CMakeLists.txt | 1 - src/OBJECT/CMakeLists.txt | 3 --- src/OperationGUI/CMakeLists.txt | 1 - src/PrimitiveGUI/CMakeLists.txt | 1 - src/RepairGUI/CMakeLists.txt | 1 - src/TransformationGUI/CMakeLists.txt | 1 - 17 files changed, 19 deletions(-) diff --git a/src/BasicGUI/CMakeLists.txt b/src/BasicGUI/CMakeLists.txt index 13fc1f7c3..fdaf19163 100644 --- 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 639265b2f..b0d8fd81f 100644 --- 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 e2846e1c4..dcc984c80 100644 --- 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 8a55c207e..1396dff25 100644 --- 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 ec84ab9f9..17ca64158 100644 --- 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 17920cb24..de4180d40 100644 --- 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 2100a00d4..1c4103e36 100644 --- 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 cd2c18388..d769e61bb 100644 --- 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 7a9f52929..3845852ac 100644 --- 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 2e8d9f4a6..7a8dff5e4 100644 --- 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 e2ec5bf33..3aba92e15 100644 --- 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 b414c42a4..5bda2362a 100644 --- 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 da54f284f..d53478f17 100644 --- 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 6a8f9cfd4..3fcc1e475 100644 --- 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 c9fda3498..3d0dc72e0 100644 --- 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 a8e4a1587..af93e5705 100644 --- 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 b85595e6a..4c640ff19 100644 --- 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}