From ed0f1a6b820395f056b404f8e56c72b7af9e9ea4 Mon Sep 17 00:00:00 2001 From: Pascal Obry Date: Fri, 31 Jan 2020 11:13:29 +0100 Subject: [PATCH] Porting to ParaView 5.8 --- src/AdvancedGUI/CMakeLists.txt | 1 - src/BasicGUI/CMakeLists.txt | 1 - src/BlocksGUI/CMakeLists.txt | 1 - src/BooleanGUI/CMakeLists.txt | 1 - src/BuildGUI/CMakeLists.txt | 1 - src/DependencyTree/CMakeLists.txt | 1 - src/DisplayGUI/CMakeLists.txt | 1 - src/EntityGUI/CMakeLists.txt | 1 - src/GEOMBase/CMakeLists.txt | 2 -- src/GEOMGUI/CMakeLists.txt | 2 -- 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 | 2 -- src/MeasureGUI/CMakeLists.txt | 1 - src/OBJECT/CMakeLists.txt | 10 +++------- src/OCC2VTK/CMakeLists.txt | 3 +-- src/OperationGUI/CMakeLists.txt | 1 - src/PrimitiveGUI/CMakeLists.txt | 1 - src/RepairGUI/CMakeLists.txt | 1 - src/TransformationGUI/CMakeLists.txt | 1 - src/VTKPlugin/CMakeLists.txt | 3 +-- 23 files changed, 5 insertions(+), 34 deletions(-) diff --git a/src/AdvancedGUI/CMakeLists.txt b/src/AdvancedGUI/CMakeLists.txt index 80ab33ae3..11b53989c 100644 --- 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/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/BlocksGUI/CMakeLists.txt b/src/BlocksGUI/CMakeLists.txt index 15d709990..a03271d32 100644 --- 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/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/DependencyTree/CMakeLists.txt b/src/DependencyTree/CMakeLists.txt index 417be383f..47f8cdace 100644 --- 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/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/GEOMBase/CMakeLists.txt b/src/GEOMBase/CMakeLists.txt index 99b94cd16..baeb178ee 100644 --- 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/GEOMGUI/CMakeLists.txt b/src/GEOMGUI/CMakeLists.txt index 7bb13b9ee..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} @@ -59,7 +58,6 @@ SET(_link_LIBRARIES ${KERNEL_SALOMELocalTrace} ${KERNEL_SalomeDS} ${KERNEL_SalomeDSClient} - ${GUI_SalomeApp} ) # --- headers --- 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 0156d1abf..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} @@ -48,7 +47,6 @@ SET(_link_LIBRARIES GEOMClient ${OpenCASCADE_ModelingData_LIBRARIES} ${KERNEL_SALOMELocalTrace} - ${GUI_SalomeApp} ) # --- headers --- 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 2de75adc5..d53478f17 100644 --- a/src/OBJECT/CMakeLists.txt +++ b/src/OBJECT/CMakeLists.txt @@ -17,13 +17,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(${VTK_USE_FILE}) - # --- options --- # additional include directories INCLUDE_DIRECTORIES( - ${VTK_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR} @@ -50,13 +47,12 @@ SET(_link_LIBRARIES ${OpenCASCADE_ModelingData_LIBRARIES} ${OpenCASCADE_Visualization_LIBRARIES} ${KERNEL_SALOMELocalTrace} - ${GUI_SalomeObject} ${GUI_SVTK} ${QT_QTCORE_LIBRARY} - vtkRenderingMatplotlib - vtkInteractionStyle + VTK::RenderingMatplotlib + VTK::InteractionStyle + VTK::IOLegacy GEOMUtils - #${VTK_LIBRARIES} ) # --- headers --- diff --git a/src/OCC2VTK/CMakeLists.txt b/src/OCC2VTK/CMakeLists.txt index 830f1dc08..1a20f347b 100644 --- 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/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} diff --git a/src/VTKPlugin/CMakeLists.txt b/src/VTKPlugin/CMakeLists.txt index 423d9c90c..6bbacaa7f 100644 --- 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 ) -- 2.30.2