mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-09-13 14:27:08 +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:
@@ -14,9 +14,7 @@
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
// prevent disabling some MSVC warning messages by VTK headers
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push)
|
||||
#endif
|
||||
#include <Standard_WarningsDisable.hxx>
|
||||
#ifdef _WIN32
|
||||
#include <vtkWin32RenderWindowInteractor.h>
|
||||
#include <vtkWin32OpenGLRenderWindow.h>
|
||||
@@ -30,13 +28,10 @@
|
||||
#include <vtkCommand.h>
|
||||
#include <vtkObjectFactory.h>
|
||||
#include <vtkSmartPointer.h>
|
||||
#include <Standard_WarningsRestore.hxx>
|
||||
|
||||
#include <IVtkDraw_Interactor.hxx>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
#include <IVtkTools_ShapePicker.hxx>
|
||||
#include <IVtkTools_SubPolyDataFilter.hxx>
|
||||
#include <IVtkTools_DisplayModeFilter.hxx>
|
||||
|
Reference in New Issue
Block a user