ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-03-23 21:37:55 +05:00
Code Issues Packages Projects Releases Wiki Activity

Porting to ParaView 5.8: additional changes

Browse Source
This commit is contained in:
vsr 2020-02-28 16:50:12 +03:00
parent f7af3a0852
commit 6052d887af
8 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/smesh_setenv.py
View File

@ -51,7 +51,7 @@ def set_env(args):
for resource_file in [i for i in os.listdir(resource_dir) \ for resource_file in [i for i in os.listdir(resource_dir) \
if osp.isfile(os.path.join(resource_dir, i))]: if osp.isfile(os.path.join(resource_dir, i))]:
# look for resource file (XML) to extract valid plugin name # 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: try:
# get plugin name from 'resources' attribute of 'meshers-group' xml node # get plugin name from 'resources' attribute of 'meshers-group' xml node
# as name extracted from environment variable can be in wrong case # as name extracted from environment variable can be in wrong case

2
src/Controls/CMakeLists.txt
View File

@ -21,7 +21,6 @@
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/SMDS ${PROJECT_SOURCE_DIR}/src/SMDS
@ -37,7 +36,6 @@ ADD_DEFINITIONS(
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${VTK_LIBRARIES}
${OpenCASCADE_FoundationClasses_LIBRARIES} ${OpenCASCADE_FoundationClasses_LIBRARIES}
${OpenCASCADE_ModelingData_LIBRARIES} ${OpenCASCADE_ModelingData_LIBRARIES}
${OpenCASCADE_ModelingAlgorithms_LIBRARIES} ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}

3
src/OBJECT/CMakeLists.txt
View File

@ -17,8 +17,6 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
find_package(ParaView REQUIRED)
# --- options --- # --- options ---
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
@ -63,7 +61,6 @@ SET(_link_LIBRARIES
SMESHClient SMESHClient
SMDS SMDS
SMESHControls SMESHControls
ParaView::pqApplicationComponents
) )
IF(SALOME_USE_PLOT2DVIEWER) IF(SALOME_USE_PLOT2DVIEWER)

3
src/PluginUtils/CMakeLists.txt
View File

@ -17,8 +17,6 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
find_package(ParaView REQUIRED)
# --- options --- # --- options ---
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
@ -56,7 +54,6 @@ SET(_link_LIBRARIES
${GUI_suit} ${GUI_suit}
SalomeIDLSMESH SalomeIDLSMESH
SMESH SMESH
ParaView::pqApplicationComponents
) )
# --- headers --- # --- headers ---

5
src/SMESHFiltersSelection/CMakeLists.txt
View File

@ -17,8 +17,6 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
find_package(ParaView REQUIRED)
# --- options --- # --- options ---
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
@ -45,13 +43,12 @@ ADD_DEFINITIONS(
SET(_link_LIBRARIES SET(_link_LIBRARIES
${KERNEL_SalomeDSClient} ${KERNEL_SalomeDSClient}
${KERNEL_SalomeDS} ${KERNEL_SalomeDS}
${GUI_SalomeApp}
${GUI_suit} ${GUI_suit}
${GEOM_GEOM}
${GEOM_GEOMClient} ${GEOM_GEOMClient}
${OpenCASCADE_FoundationClasses_LIBRARIES} ${OpenCASCADE_FoundationClasses_LIBRARIES}
${OpenCASCADE_ModelingData_LIBRARIES} ${OpenCASCADE_ModelingData_LIBRARIES}
SalomeIDLSMESH SalomeIDLSMESH
ParaView::pqApplicationComponents
) )
# --- headers --- # --- headers ---

3
src/SMESHGUI/CMakeLists.txt
View File

@ -17,8 +17,6 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
find_package(ParaView REQUIRED)
INCLUDE(UseQtExt) INCLUDE(UseQtExt)
# --- options --- # --- options ---
@ -75,7 +73,6 @@ SET(_link_LIBRARIES
SMDS SMDS
SMESHControls SMESHControls
SMESHObject SMESHObject
ParaView::pqApplicationComponents
) )
# --- headers --- # --- headers ---

3
src/SMESH_SWIG_WITHIHM/CMakeLists.txt
View File

@ -17,8 +17,6 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
find_package(ParaView REQUIRED)
INCLUDE(${SWIG_USE_FILE}) INCLUDE(${SWIG_USE_FILE})
# --- options --- # --- options ---
@ -60,7 +58,6 @@ SET(_link_LIBRARIES
${GUI_std} ${GUI_std}
${GUI_Event} ${GUI_Event}
SMESH SMESH
ParaView::pqApplicationComponents
) )
# --- headers --- # --- headers ---

1
src/Tools/padder/meshjob/impl/CMakeLists.txt
View File

@ -22,7 +22,6 @@
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS} ${GEOM_INCLUDE_DIRS}
${VTK_INCLUDE_DIRS}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}