f3c231d641
- switches opencascade to vtk9 to enable upcoming import of
cad/py-ocp
- cad/freecad has to switch vtk8 -> vtk9, too
- this requires upstream commit 0cfea3fee3e7848bbf043d2b1a19f6405d7ebe25
"Make smesh compile with vtk9"
- while touching this, fixes vtk module detection
- clean up VTK_DIR usage: that variable does not exist in FreeCAD's
build system anymore (for quite some time, actually)
Obtained from: opencascade upstream: Kirill Gavrilov
Obtained from: freecad upstream: committed by github/wwmayer
Differential Revision: D30934
Reported by: thierry@
Submitted by: thierry@
41 lines
1.7 KiB
CMake
41 lines
1.7 KiB
CMake
--- cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake.orig 2021-04-15 09:17:08 UTC
|
|
+++ cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake
|
|
@@ -12,24 +12,24 @@ macro(SetupSalomeSMESH)
|
|
|
|
#if we use smesh we definitely also need vtk, no matter of external or internal smesh
|
|
set (VTK_COMPONENTS
|
|
- vtkCommonCore
|
|
- vtkCommonDataModel
|
|
- vtkFiltersVerdict
|
|
- vtkIOXML
|
|
- vtkFiltersCore
|
|
- vtkFiltersGeneral
|
|
- vtkIOLegacy
|
|
- vtkFiltersExtraction
|
|
- vtkFiltersSources
|
|
- vtkFiltersGeometry
|
|
+ CommonCore
|
|
+ tkCommonDataModel
|
|
+ tkFiltersVerdict
|
|
+ tkIOXML
|
|
+ tkFiltersCore
|
|
+ tkFiltersGeneral
|
|
+ tkIOLegacy
|
|
+ tkFiltersExtraction
|
|
+ tkFiltersSources
|
|
+ tkFiltersGeometry
|
|
)
|
|
|
|
# check which modules are available
|
|
if(UNIX OR WIN32)
|
|
- find_package(VTK COMPONENTS vtkCommonCore REQUIRED NO_MODULE)
|
|
- list(APPEND VTK_COMPONENTS vtkIOMPIParallel vtkParallelMPI vtkhdf5 vtkFiltersParallelDIY2 vtkRenderingCore vtkInteractionStyle vtkRenderingFreeType vtkRenderingOpenGL2)
|
|
+ find_package(VTK COMPONENTS CommonCore REQUIRED NO_MODULE)
|
|
+ list(APPEND VTK_COMPONENTS IOMPIParallel ParallelMPI hdf5 FiltersParallelDIY2 RenderingCore InteractionStyle RenderingFreeType RenderingOpenGL2)
|
|
foreach(_module ${VTK_COMPONENTS})
|
|
- list (FIND VTK_MODULES_ENABLED ${_module} _index)
|
|
+ list (FIND VTK_AVAILABLE_COMPONENTS ${_module} _index)
|
|
if (${_index} GREATER -1)
|
|
list(APPEND AVAILABLE_VTK_COMPONENTS ${_module})
|
|
endif()
|