From 6052d887afc1b0080cb6eb4027e1af12fb6d9e43 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 28 Feb 2020 16:50:12 +0300 Subject: [PATCH] Porting to ParaView 5.8: additional changes --- bin/smesh_setenv.py | 2 +- src/Controls/CMakeLists.txt | 2 -- src/OBJECT/CMakeLists.txt | 3 --- src/PluginUtils/CMakeLists.txt | 3 --- src/SMESHFiltersSelection/CMakeLists.txt | 5 +---- src/SMESHGUI/CMakeLists.txt | 3 --- src/SMESH_SWIG_WITHIHM/CMakeLists.txt | 3 --- src/Tools/padder/meshjob/impl/CMakeLists.txt | 1 - 8 files changed, 2 insertions(+), 20 deletions(-) diff --git a/bin/smesh_setenv.py b/bin/smesh_setenv.py index a0b757685..6826ab0ce 100644 --- 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 85b95d4c4..b7e1f7218 100644 --- 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 d1a737cd2..30d8684d3 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 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 8c3999cc5..cc0c0dfc3 100644 --- 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 5741d47f2..e06ba7075 100644 --- 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 9489ca93a..5a7d8b29b 100644 --- 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 54c7e6fdf..153f400e0 100644 --- 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 499a30e02..0becd9885 100644 --- 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} -- 2.39.2