mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-14 13:30:48 +03:00
0031582: Configuration, CMake - OCCT fails to build with VTK 9.0
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:
@@ -19,7 +19,10 @@
|
||||
#include <IVtkTools.hxx>
|
||||
#include <IVtkOCC_Shape.hxx>
|
||||
#include <IVtkVTK_ShapeData.hxx>
|
||||
|
||||
#include <Standard_WarningsDisable.hxx>
|
||||
#include <vtkPolyDataAlgorithm.h>
|
||||
#include <Standard_WarningsRestore.hxx>
|
||||
|
||||
class vtkIdTypeArray;
|
||||
class vtkPolyData;
|
||||
|
@@ -20,15 +20,11 @@
|
||||
#include <IVtkOCC_Shape.hxx>
|
||||
|
||||
// prevent disabling some MSVC warning messages by VTK headers
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push)
|
||||
#endif
|
||||
#include <Standard_WarningsDisable.hxx>
|
||||
#include <vtkDataObject.h>
|
||||
#include <vtkSetGet.h>
|
||||
#include <vtkWeakPointer.h>
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
#include <Standard_WarningsRestore.hxx>
|
||||
|
||||
class vtkActor;
|
||||
class vtkDataSet;
|
||||
|
@@ -21,14 +21,10 @@
|
||||
#include <IVtkOCC_ShapePickerAlgo.hxx>
|
||||
|
||||
// prevent disabling some MSVC warning messages by VTK headers
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push)
|
||||
#endif
|
||||
#include <Standard_WarningsDisable.hxx>
|
||||
#include <vtkAbstractPropPicker.h>
|
||||
#include <vtkSmartPointer.h>
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
#include <Standard_WarningsRestore.hxx>
|
||||
|
||||
class vtkRenderer;
|
||||
class vtkActorCollection;
|
||||
|
@@ -18,7 +18,9 @@
|
||||
|
||||
#include <IVtkTools.hxx>
|
||||
|
||||
#include "vtkPolyDataAlgorithm.h"
|
||||
#include <Standard_WarningsDisable.hxx>
|
||||
#include <vtkPolyDataAlgorithm.h>
|
||||
#include <Standard_WarningsRestore.hxx>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push)
|
||||
|
Reference in New Issue
Block a user