From f6052b0e1e359c3a86374e538f86ace697cc88cd Mon Sep 17 00:00:00 2001 From: Pascal Obry Date: Fri, 31 Jan 2020 11:13:29 +0100 Subject: [PATCH] Port GEOM to new ParaView 5.8. --- src/AdvancedGUI/CMakeLists.txt | 1 - src/BlocksGUI/CMakeLists.txt | 1 - src/DependencyTree/CMakeLists.txt | 1 - src/DlgRef/CMakeLists.txt | 1 - src/GEOMBase/CMakeLists.txt | 2 -- src/GEOMFiltersSelection/CMakeLists.txt | 1 - src/GEOMGUI/CMakeLists.txt | 1 - src/Material/CMakeLists.txt | 1 - src/OBJECT/CMakeLists.txt | 10 ++++------ src/OCC2VTK/CMakeLists.txt | 3 +-- src/VTKPlugin/CMakeLists.txt | 3 +-- 11 files changed, 6 insertions(+), 19 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/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/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/DlgRef/CMakeLists.txt b/src/DlgRef/CMakeLists.txt index 0d1b8790d..9fb0e2541 100644 --- 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 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/GEOMFiltersSelection/CMakeLists.txt b/src/GEOMFiltersSelection/CMakeLists.txt index 78771cc75..37c0c1124 100644 --- 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 7bb13b9ee..17920cb24 100644 --- 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 0156d1abf..e2ec5bf33 100644 --- 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 2de75adc5..295cd1c85 100644 --- 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 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/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.39.2