Porting to ParaView 5.8: additional changes

diff --git a/bin/smesh_setenv.py b/bin/smesh_setenv.py
index a0b75768563d8267eb1327c268689a818970ad02..6826ab0cefa898fac93585d5a9ce1ef53dfffd9b 100644 (file)
--- a/bin/smesh_setenv.py
+++ b/bin/smesh_setenv.py
@@ -51,7 +51,7 @@ def set_env(args):
         for resource_file in [i for i in os.listdir(resource_dir) \
                                   if osp.isfile(os.path.join(resource_dir, i))]:
             # look for resource file (XML) to extract valid plugin name
-            if resource_file.lower() == '{plugin_lname}.xml':
+            if resource_file.lower() == f'{plugin_lname}.xml':
                 try:
                     # get plugin name from 'resources' attribute of 'meshers-group' xml node
                     # as name extracted from environment variable can be in wrong case

diff --git a/src/Controls/CMakeLists.txt b/src/Controls/CMakeLists.txt
index 85b95d4c4a8efa9914772b0d772c2bc6a1244cfc..b7e1f7218881d2b5cdb78153f279dc59ea0da184 100644 (file)
--- a/src/Controls/CMakeLists.txt
+++ b/src/Controls/CMakeLists.txt
@@ -21,7 +21,6 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${OpenCASCADE_INCLUDE_DIR}
-  ${VTK_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/SMDS
@@ -37,7 +36,6 @@ ADD_DEFINITIONS(
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${VTK_LIBRARIES}
   ${OpenCASCADE_FoundationClasses_LIBRARIES}
   ${OpenCASCADE_ModelingData_LIBRARIES}
   ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}

diff --git a/src/OBJECT/CMakeLists.txt b/src/OBJECT/CMakeLists.txt
index d1a737cd20f2cc338fd5eb715d888f8bb37a6bf3..30d8684d318586a450d93fe6735188bd329af6de 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
 INCLUDE_DIRECTORIES(
@@ -63,7 +61,6 @@ SET(_link_LIBRARIES
   SMESHClient
   SMDS
   SMESHControls
-  ParaView::pqApplicationComponents
 )
 
 IF(SALOME_USE_PLOT2DVIEWER)

diff --git a/src/PluginUtils/CMakeLists.txt b/src/PluginUtils/CMakeLists.txt
index 8c3999cc5ec4ae8c8bf3c8cf210a4a5b411a0bc2..cc0c0dfc3d189a2748eeb0792f93b93b817a394a 100644 (file)
--- a/src/PluginUtils/CMakeLists.txt
+++ b/src/PluginUtils/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
 INCLUDE_DIRECTORIES(
@@ -56,7 +54,6 @@ SET(_link_LIBRARIES
   ${GUI_suit}
   SalomeIDLSMESH
   SMESH
-  ParaView::pqApplicationComponents
 )
 
 # --- headers ---

diff --git a/src/SMESHFiltersSelection/CMakeLists.txt b/src/SMESHFiltersSelection/CMakeLists.txt
index 5741d47f24049f318a9fa7a82ee3e1f965b10f7c..e06ba7075ea62289e897714105c090a240ba401f 100644 (file)
--- a/src/SMESHFiltersSelection/CMakeLists.txt
+++ b/src/SMESHFiltersSelection/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
 INCLUDE_DIRECTORIES(
@@ -45,13 +43,12 @@ ADD_DEFINITIONS(
 SET(_link_LIBRARIES
   ${KERNEL_SalomeDSClient}
   ${KERNEL_SalomeDS}
+  ${GUI_SalomeApp}
   ${GUI_suit}
-  ${GEOM_GEOM}
   ${GEOM_GEOMClient}
   ${OpenCASCADE_FoundationClasses_LIBRARIES}
   ${OpenCASCADE_ModelingData_LIBRARIES}
   SalomeIDLSMESH
-  ParaView::pqApplicationComponents
 )
 
 # --- headers ---

diff --git a/src/SMESHGUI/CMakeLists.txt b/src/SMESHGUI/CMakeLists.txt
index 9489ca93a7b44c135480d0ed5295ea48454b91dc..5a7d8b29bf778fdc9b7fb9fbf5e1561b9b29e50f 100644 (file)
--- a/src/SMESHGUI/CMakeLists.txt
+++ b/src/SMESHGUI/CMakeLists.txt
@@ -17,8 +17,6 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-find_package(ParaView REQUIRED)
-
 INCLUDE(UseQtExt)
 
 # --- options ---
@@ -75,7 +73,6 @@ SET(_link_LIBRARIES
   SMDS
   SMESHControls
   SMESHObject
-  ParaView::pqApplicationComponents
 )
 
 # --- headers ---

diff --git a/src/SMESH_SWIG_WITHIHM/CMakeLists.txt b/src/SMESH_SWIG_WITHIHM/CMakeLists.txt
index 54c7e6fdf1e44fc2cabdb01d1bdc4e8cb42567d0..153f400e01fe2ad6d673cc2659528e7198f27760 100644 (file)
--- a/src/SMESH_SWIG_WITHIHM/CMakeLists.txt
+++ b/src/SMESH_SWIG_WITHIHM/CMakeLists.txt
@@ -17,8 +17,6 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-find_package(ParaView REQUIRED)
-
 INCLUDE(${SWIG_USE_FILE})
 
 # --- options ---
@@ -60,7 +58,6 @@ SET(_link_LIBRARIES
   ${GUI_std}
   ${GUI_Event}
   SMESH
-  ParaView::pqApplicationComponents
 )
 
 # --- headers ---

diff --git a/src/Tools/padder/meshjob/impl/CMakeLists.txt b/src/Tools/padder/meshjob/impl/CMakeLists.txt
index 499a30e02f3ffd84ebd47f5892c0067be0ec99c1..0becd9885633a950337eadc60410ab529ca22453 100644 (file)
--- a/src/Tools/padder/meshjob/impl/CMakeLists.txt
+++ b/src/Tools/padder/meshjob/impl/CMakeLists.txt
@@ -22,7 +22,6 @@
 INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
   ${GEOM_INCLUDE_DIRS}
-  ${VTK_INCLUDE_DIRS}
   ${OpenCASCADE_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}