OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0031582: Configuration, CMake - OCCT fails to build with VTK 9.0

Browse Source 
Handle "VTK::" prefix instead of "vtk" used by previous VTK versions for targets.
Corrected unexpected location of endif() and broken indentation.
Obsolete $VTK_USE_FILE is no more included (basing on VTK version check).

Standard_WarningsDisable.hxx/Standard_WarningsRestore.hxx pair is now used to suppress VTK warnings instead of partial disabling.
This commit is contained in:
kgv
2020-08-17 12:58:31 +03:00
committed by bugmaster
parent ce9aefc8aa
commit 8e16477b50
13 changed files with 110 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/IVtkVTK/IVtkVTK_ShapeData.cxx
View File

@@ -16,17 +16,13 @@
#include <IVtkVTK_ShapeData.hxx>
// prevent disabling some MSVC warning messages by VTK headers
#ifdef _MSC_VER
#pragma warning(push)
#endif
#include <Standard_WarningsDisable.hxx>
#include <vtkCellData.h>
#include <vtkDoubleArray.h>
#include <vtkIdList.h>
#include <vtkPoints.h>
#include <vtkPolyData.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#include <Standard_WarningsRestore.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IVtkVTK_ShapeData,IVtk_IShapeData)

8
src/IVtkVTK/IVtkVTK_ShapeData.hxx
View File

@@ -19,15 +19,11 @@
#include <IVtk_IShapeData.hxx>
// prevent disabling some MSVC warning messages by VTK headers
#ifdef _MSC_VER
#pragma warning(push)
#endif
#include <Standard_WarningsDisable.hxx>
#include <vtkPolyData.h>
#include <vtkSmartPointer.h>
#include <vtkIdTypeArray.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#include <Standard_WarningsRestore.hxx>
class vtkIdTypeArray;