From: jfa <jfa@opencascade.com>
Date: Fri, 12 Aug 2011 13:12:13 +0000 (+0000)
Subject: Porting to OCCT6.5.1
X-Git-Tag: V6_4_0a1~109
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=33fc29c42a41139519566e0044e9abe0ef403367;p=modules%2Fsmesh.git

Porting to OCCT6.5.1
---

diff --git a/src/SMESH/Makefile.am b/src/SMESH/Makefile.am
index 9c2ab4130..e5f466f8d 100644
--- a/src/SMESH/Makefile.am
+++ b/src/SMESH/Makefile.am
@@ -69,7 +69,6 @@ dist_libSMESHimpl_la_SOURCES = \
 # additionnal information to compile and link file
 libSMESHimpl_la_CPPFLAGS = \
 	$(KERNEL_CXXFLAGS) \
-	$(GUI_CXXFLAGS) \
 	$(CAS_CPPFLAGS) \
 	$(MED_CXXFLAGS) \
 	$(GEOM_CXX_FLAGS) \
diff --git a/src/SMESH/SMESH_Algo.cxx b/src/SMESH/SMESH_Algo.cxx
index 05a84cdcd..e561cff93 100644
--- a/src/SMESH/SMESH_Algo.cxx
+++ b/src/SMESH/SMESH_Algo.cxx
@@ -39,7 +39,7 @@
 #include "SMESH_Mesh.hxx"
 #include "SMESH_TypeDefs.hxx"
 
-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>
 
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepLProp.hxx>
diff --git a/src/SMESH/SMESH_MeshEditor.cxx b/src/SMESH/SMESH_MeshEditor.cxx
index 9ea2f7d1e..8bb6d8c78 100644
--- a/src/SMESH/SMESH_MeshEditor.cxx
+++ b/src/SMESH/SMESH_MeshEditor.cxx
@@ -49,7 +49,7 @@
 #include "SMESH_OctreeNode.hxx"
 #include "SMESH_subMesh.hxx"
 
-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>
 
 #include "utilities.h"
 
diff --git a/src/SMESH/SMESH_Pattern.cxx b/src/SMESH/SMESH_Pattern.cxx
index 61c1ce73b..f614a6709 100644
--- a/src/SMESH/SMESH_Pattern.cxx
+++ b/src/SMESH/SMESH_Pattern.cxx
@@ -73,7 +73,7 @@
 #include "SMESH_MesherHelper.hxx"
 #include "SMESH_subMesh.hxx"
 
-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>
 
 #include <Basics_Utils.hxx>
 #include "utilities.h"
diff --git a/src/SMESH/SMESH_subMesh.cxx b/src/SMESH/SMESH_subMesh.cxx
index ddc7eb395..8a04a26c1 100644
--- a/src/SMESH/SMESH_subMesh.cxx
+++ b/src/SMESH/SMESH_subMesh.cxx
@@ -37,7 +37,7 @@
 #include "SMDS_SetIterator.hxx"
 #include "SMDSAbs_ElementType.hxx"
 
-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>
 
 #include "utilities.h"
 #include "OpUtil.hxx"