ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 09:20:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Porting to ParaView 5.8

Browse Source
This commit is contained in:
Pascal Obry 2020-01-31 11:13:29 +01:00 committed by vsr
parent 16eda1b07a
commit 5c135f5424
23 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/AdvancedGUI/CMakeLists.txt
View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

1
src/BasicGUI/CMakeLists.txt
View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

1
src/BlocksGUI/CMakeLists.txt
View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

1
src/BooleanGUI/CMakeLists.txt
View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

1
src/BuildGUI/CMakeLists.txt
View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

1
src/DependencyTree/CMakeLists.txt
View File

@ -49,7 +49,6 @@ ENDIF(WIN32)
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
${QT_LIBRARIES} ${QT_LIBRARIES}
${GUI_SalomeApp}
${GUI_GraphicsView} ${GUI_GraphicsView}
GEOM GEOM
GEOMBase GEOMBase

1
src/DisplayGUI/CMakeLists.txt
View File

@ -22,7 +22,6 @@
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

1
src/EntityGUI/CMakeLists.txt
View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OPENCV_INCLUDE_DIR} ${OPENCV_INCLUDE_DIR}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}

2
src/GEOMBase/CMakeLists.txt
View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
@ -55,7 +54,6 @@ SET(_link_LIBRARIES
GEOM GEOM
DlgRef DlgRef
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
${GUI_SalomeApp}
) )
# --- headers --- # --- headers ---

2
src/GEOMGUI/CMakeLists.txt
View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
@ -59,7 +58,6 @@ SET(_link_LIBRARIES
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
${KERNEL_SalomeDS} ${KERNEL_SalomeDS}
${KERNEL_SalomeDSClient} ${KERNEL_SalomeDSClient}
${GUI_SalomeApp}
) )
# --- headers --- # --- headers ---

1
src/GEOMToolsGUI/CMakeLists.txt
View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

1
src/GEOM_SWIG_WITHIHM/CMakeLists.txt
View File

@ -25,7 +25,6 @@ INCLUDE(${SWIG_USE_FILE})
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

1
src/GenerationGUI/CMakeLists.txt
View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

1
src/GroupGUI/CMakeLists.txt
View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

2
src/Material/CMakeLists.txt
View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
@ -48,7 +47,6 @@ SET(_link_LIBRARIES
GEOMClient GEOMClient
${OpenCASCADE_ModelingData_LIBRARIES} ${OpenCASCADE_ModelingData_LIBRARIES}
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
${GUI_SalomeApp}
) )
# --- headers --- # --- headers ---

1
src/MeasureGUI/CMakeLists.txt
View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

10
src/OBJECT/CMakeLists.txt
View File

@ -17,13 +17,10 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
INCLUDE(${VTK_USE_FILE})
# --- options --- # --- options ---
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${VTK_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
@ -50,13 +47,12 @@ SET(_link_LIBRARIES
${OpenCASCADE_ModelingData_LIBRARIES} ${OpenCASCADE_ModelingData_LIBRARIES}
${OpenCASCADE_Visualization_LIBRARIES} ${OpenCASCADE_Visualization_LIBRARIES}
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
${GUI_SalomeObject}
${GUI_SVTK} ${GUI_SVTK}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
vtkRenderingMatplotlib VTK::RenderingMatplotlib
vtkInteractionStyle VTK::InteractionStyle
VTK::IOLegacy
GEOMUtils GEOMUtils
#${VTK_LIBRARIES}
) )
# --- headers --- # --- headers ---

3
src/OCC2VTK/CMakeLists.txt
View File

@ -23,7 +23,6 @@
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${VTK_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}/src/GEOMUtils ${PROJECT_SOURCE_DIR}/src/GEOMUtils
) )
@ -35,7 +34,7 @@ ADD_DEFINITIONS(
# libraries to link to # libraries to link to
SET(_link_LIBRARIES SET(_link_LIBRARIES
vtkFiltersCore VTK::FiltersCore
${OpenCASCADE_FoundationClasses_LIBRARIES} ${OpenCASCADE_FoundationClasses_LIBRARIES}
${OpenCASCADE_ModelingAlgorithms_LIBRARIES} ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}

1
src/OperationGUI/CMakeLists.txt
View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

1
src/PrimitiveGUI/CMakeLists.txt
View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

1
src/RepairGUI/CMakeLists.txt
View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

1
src/TransformationGUI/CMakeLists.txt
View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

3
src/VTKPlugin/CMakeLists.txt
View File

@ -26,7 +26,6 @@ ENDIF()
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}
${PROJECT_BINARY_DIR}/idl ${PROJECT_BINARY_DIR}/idl
${PROJECT_SOURCE_DIR}/src/GEOMAlgo ${PROJECT_SOURCE_DIR}/src/GEOMAlgo
@ -71,7 +70,7 @@ SET(_link_engine_LIBRARIES
SalomeIDLVTKPlugin SalomeIDLVTKPlugin
GEOMEngine GEOMEngine
GEOMClient GEOMClient
vtkIOLegacy VTK::IOLegacy
OCC2VTK OCC2VTK
) )