Porting to OCCT6.5.1

diff --git a/src/CAF/CAF_Study.cxx b/src/CAF/CAF_Study.cxx
index 5b1bf5fb5784dea28e741d09d9fdb9c821c629b9..20238d7cfb4677f2c1e15ed1e4ccb7b21c470ddf 100755 (executable)
--- 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 b07cad561c5f68a351b4dc417eada9454ee41eb2..22c73b7124357b3851b67078bf56363536b6e12f 100755 (executable)
--- 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 6abf709c1e10550672b8d3fc7ff12d06141de818..f02cf4390a4c3ce4983d59a5dd948eaf7676df3f 100644 (file)
--- 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 dba61509077c90fd507c055f0e439d157230568c..3483c9492bc7c0610ab1963cc84dd9928d79a9e1 100755 (executable)
--- 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 ba60000339fb40f3dcbf12b91b917085a8815872..db79e0dedb7ca8e4afef3fef456d56bc3bc9189d 100644 (file)
--- 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 bd4f7becda15bf03b5d7d482085fbb134b52f1cf..fb30817446bd610cfe9e71bb88611ff5a5488cfa 100755 (executable)
--- 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 c2aa154b424e88bc772db32625cef702b0564bb9..3dfa0ef2182557373405b3bbf06e9bba2ebd4e41 100644 (file)
--- 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 f570b83b090e745e31482831d5489f02b65a878f..06801b37a18d409e5745c23284dd5be89c875030 100755 (executable)
--- 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 8b67dc1c40db522eed4cb258872185116fbb9feb..2388b95dedd91d2ed67adef337b0de9f555313a8 100755 (executable)
--- 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 9d787ae3abf022c8c1cacd98af43d59c224e31a7..6b92725d4fe5de1b3287ffaa2f096c9553fe7933 100644 (file)
--- 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 82b17cf607feaca3c6c1c0b796440e8b2a856d79..3ce58ab5b6086955eb6e6b2fe10ba36f1851d191 100755 (executable)
--- 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>