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

Porting to OCCT6.5.1
---

diff --git a/src/CAF/CAF_Study.cxx b/src/CAF/CAF_Study.cxx
index 5b1bf5fb5..20238d7cf 100755
--- a/src/CAF/CAF_Study.cxx
+++ b/src/CAF/CAF_Study.cxx
@@ -24,7 +24,7 @@
 #include "CAF_Tools.h"
 #include "CAF_Application.h"
 
-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>
 
 #include <SUIT_Desktop.h>
 #include <SUIT_MessageBox.h>
diff --git a/src/CAF/Makefile.am b/src/CAF/Makefile.am
index b07cad561..22c73b712 100755
--- a/src/CAF/Makefile.am
+++ b/src/CAF/Makefile.am
@@ -52,7 +52,7 @@ nodist_salomeres_DATA = \
 	CAF_msg_en.qm \
 	CAF_msg_fr.qm
 
-libcaf_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) -I$(srcdir)/../CASCatch	\
+libcaf_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) @KERNEL_CXXFLAGS@	\
 	-I$(srcdir)/../STD -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx
 libcaf_la_LDFLAGS  = $(QT_MT_LIBS) $(CAS_OCAF) $(CAS_OCAFVIS)
 libcaf_la_LIBADD   = ../Qtx/libqtx.la ../SUIT/libsuit.la ../STD/libstd.la
diff --git a/src/DDS/DDS_Dictionary.cxx b/src/DDS/DDS_Dictionary.cxx
index 6abf709c1..f02cf4390 100644
--- a/src/DDS/DDS_Dictionary.cxx
+++ b/src/DDS/DDS_Dictionary.cxx
@@ -23,7 +23,7 @@
 
 #include "DDS_KeyWords.h"
 
-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>
 
 #include <LDOMString.hxx>
 #include <LDOMParser.hxx>
diff --git a/src/DDS/Makefile.am b/src/DDS/Makefile.am
index dba615090..3483c9492 100755
--- a/src/DDS/Makefile.am
+++ b/src/DDS/Makefile.am
@@ -41,6 +41,6 @@ dist_libDDS_la_SOURCES = 	\
 	DDS_Dictionary.cxx	\
 	DDS_KeyWords.cxx
 
-libDDS_la_CPPFLAGS = $(CAS_CPPFLAGS) -I$(srcdir)/../CASCatch
+libDDS_la_CPPFLAGS = $(CAS_CPPFLAGS) @KERNEL_CXXFLAGS@
 
 libDDS_la_LDFLAGS  = $(CAS_KERNEL) $(CAS_OCAF)
diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index ba6000033..db79e0ded 100644
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -55,7 +55,7 @@
 #include "LightApp_DataObject.h"
 #include "LightApp_WgViewModel.h"
 
-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>
 
 #include <SALOME_Event.h>
 
diff --git a/src/OCCViewer/Makefile.am b/src/OCCViewer/Makefile.am
index bd4f7becd..fb3081744 100755
--- a/src/OCCViewer/Makefile.am
+++ b/src/OCCViewer/Makefile.am
@@ -123,7 +123,7 @@ nodist_salomeres_DATA =		\
 	OCCViewer_msg_en.qm 	\
 	OCCViewer_msg_fr.qm 
 
-libOCCViewer_la_CPPFLAGS = $(QT_INCLUDES) $(OGL_INCLUDES) $(CAS_CPPFLAGS) \
+libOCCViewer_la_CPPFLAGS = $(QT_INCLUDES) $(OGL_INCLUDES) $(CAS_CPPFLAGS) @KERNEL_CXXFLAGS@ \
 	-I$(srcdir)/../SUIT -I$(srcdir)/../ViewerTools -I$(srcdir)/../Qtx \
 	-I$(srcdir)/../OpenGLUtils -I$(srcdir)/../CASCatch
 
diff --git a/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx b/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx
index c2aa154b4..3dfa0ef21 100644
--- a/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx
+++ b/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx
@@ -28,7 +28,7 @@
 #include "QtxAction.h"
 #include "QtxIntSpinBox.h"
 
-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>
 
 #include <QCheckBox>
 #include <QGroupBox>
diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.cxx b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
index f570b83b0..06801b37a 100755
--- a/src/OCCViewer/OCCViewer_ViewPort3d.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
@@ -25,7 +25,7 @@
 #include "OCCViewer_ViewWindow.h"
 #include "OCCViewer_ViewModel.h"
 
-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>
 
 #include <SUIT_ViewManager.h>
 
diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx
index 8b67dc1c4..2388b95de 100755
--- a/src/OCCViewer/OCCViewer_ViewWindow.cxx
+++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx
@@ -33,7 +33,7 @@
 #include "OCCViewer_AxialScaleDlg.h"
 #include "OCCViewer_CubeAxesDlg.h"
 
-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>
 
 #include <SUIT_Desktop.h>
 #include <SUIT_Session.h>
diff --git a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx b/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
index 9d787ae3a..6b92725d4 100644
--- a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
+++ b/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
@@ -22,7 +22,7 @@
 #include "SalomeApp_ExceptionHandler.h"
 
 #include "CASCatch.hxx"
-#include "CASCatch_OCCTVersion.hxx"
+#include "Basics_OCCTVersion.hxx"
 
 #include <OSD.hxx>
 
diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx
index 82b17cf60..3ce58ab5b 100755
--- a/src/Session/SALOME_Session_Server.cxx
+++ b/src/Session/SALOME_Session_Server.cxx
@@ -29,7 +29,7 @@
 #include <SALOME_LifeCycleCORBA.hxx>
 #include <SALOME_Event.h>
 
-#include <CASCatch_OCCTVersion.hxx>
+#include <Basics_OCCTVersion.hxx>
 
 #include <Container_init_python.hxx>
 #include <ConnectionManager_i.hxx>