Support of CASCADE 5.2.4

diff --git a/src/GEOMBase/Makefile.in b/src/GEOMBase/Makefile.in
index 9dff7f68d3dceed80b628c142ed478533d6430de..76c7ffb81dfdbbbe4c58389dfcd61b616bfa5865 100644 (file)
--- a/src/GEOMBase/Makefile.in
+++ b/src/GEOMBase/Makefile.in
@@ -66,6 +66,6 @@ LIB_SERVER_IDL =
 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
 CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
 
-LDFLAGS += -lDlgRef -lGEOMGUI
+LDFLAGS += -lDlgRef -lGEOMGUI $(CAS_LDPATH) -lTKPrim
 
 @CONCLUDE@

diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
index dc5d0b9db06420c38a0595c814661ef29a75559c..a5b8dcbcf314a0a9447447dec4b53d8ac02d5f93 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx
@@ -9,7 +9,18 @@ using namespace std;
 #include <BRep_Tool.hxx>
 #include <BRep_Builder.hxx>
 #include <BRepAlgo_FaceRestrictor.hxx>
+
+#include <Standard_Version.hxx>
+#ifdef OCC_VERSION_MAINTENANCE 
+#if (OCC_VERSION_MAJOR >= 5 && OCC_VERSION_MINOR >= 2 && OCC_VERSION_MAINTENANCE >= 4)
+#include <BRepBuilderAPI_Sewing.hxx>
+#define BRepAlgo_Sewing BRepBuilderAPI_Sewing
+#else 
 #include <BRepAlgo_Sewing.hxx>
+#endif 
+#else #include <BRepAlgo_Sewing.hxx>
+#endif 
+
 #include <BRepBuilderAPI_Copy.hxx>
 #include <BRepTools_Quilt.hxx>
 #include <BRepCheck.hxx>

diff --git a/src/ShHealOper/ShHealOper_Sewing.cxx b/src/ShHealOper/ShHealOper_Sewing.cxx
index b0f8e4206a43a007eca91c3fdc28a1af03341fcb..78b72c3c95dc266f8d6a469959de39f380318309 100644 (file)
--- a/src/ShHealOper/ShHealOper_Sewing.cxx
+++ b/src/ShHealOper/ShHealOper_Sewing.cxx
@@ -94,7 +94,12 @@ Standard_Boolean ShHealOper_Sewing::sewing(const TopTools_SequenceOfShape& theSe
     return myDone;
   }
   //sewing shape
-  Handle(BRepAlgo_Sewing) aSewing = new BRepAlgo_Sewing;
+#ifdef __OCC_5_2_4__
+  Handle(BRepBuilderAPI_Sewing) aSewing  = new BRepBuilderAPI_Sewing;
+#else
+  Handle(BRepAlgo_Sewing) aSewing  = new BRepAlgo_Sewing;  
+#endif
+
   aSewing->Load(myInitShape);
   aSewing->SetTolerance(myTolerance);
   aSewing->SetFaceMode(myFacesMode);
@@ -221,7 +226,14 @@ Standard_Boolean ShHealOper_Sewing::getWires(const TopoDS_Shape& theSewShape) co
 //=======================================================================
 
 Standard_Boolean ShHealOper_Sewing::getModifications(const TopoDS_Shape& theShape,
-                                                     const Handle(BRepAlgo_Sewing)& theSewing) const
+
+#ifdef __OCC_5_2_4__
+                                                     const Handle(BRepBuilderAPI_Sewing)& 
+#else
+                                                    const Handle(BRepAlgo_Sewing)& 
+#endif
+
+theSewing) const
 {
   if((Standard_Integer)theShape.ShapeType() > (Standard_Integer)myHistoryLevel)
     return Standard_False;

diff --git a/src/ShHealOper/ShHealOper_Sewing.hxx b/src/ShHealOper/ShHealOper_Sewing.hxx
index e7244b227efe6c89d3aa47a9ec50ad60aa514d0a..736f0d847baba0fbffb457f129273fc010457377 100644 (file)
--- a/src/ShHealOper/ShHealOper_Sewing.hxx
+++ b/src/ShHealOper/ShHealOper_Sewing.hxx
@@ -28,7 +28,18 @@
 #include <ShHealOper_Tool.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopAbs_ShapeEnum.hxx>
+#include <Standard_Version.hxx>
+#ifdef OCC_VERSION_MAINTENANCE
+#if (OCC_VERSION_MAJOR >= 5 && OCC_VERSION_MINOR >= 2 && OCC_VERSION_MAINTENANCE >= 4)
+#include <BRepBuilderAPI_Sewing.hxx>
+#define __OCC_5_2_4__
+#else
 #include <BRepAlgo_Sewing.hxx>
+#endif
+#else
+#include <BRepAlgo_Sewing.hxx>
+#endif
+
 #include <TopoDS_Compound.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
@@ -125,7 +136,12 @@ class ShHealOper_Sewing : public ShHealOper_Tool
   Standard_Boolean getShells(const TopoDS_Shape& theSewShape) const;
   Standard_Boolean getWires(const TopoDS_Shape& theSewShape) const;
   Standard_Boolean getModifications(const TopoDS_Shape& theShape,
-                                    const Handle(BRepAlgo_Sewing)& theSewing) const;
+#ifdef __OCC_5_2_4__
+                                    const Handle(BRepBuilderAPI_Sewing)& 
+#else
+                                   const Handle(BRepAlgo_Sewing)&
+#endif
+theSewing) const;
   
   Standard_Boolean isSewed(const TopoDS_Shape& theShape) const;