Issue 0019994: integrate patch for compilation with cmake (from E.Adam)

diff --git a/src/OCCViewer/OCCViewer.cxx b/src/OCCViewer/OCCViewer.cxx
index cf7f06e6a22b1adbf75f62c7cf243aaaa3efaac5..7a5c47e72301393e7361131db9d2e2cce3eaec4b 100644 (file)
--- a/src/OCCViewer/OCCViewer.cxx
+++ b/src/OCCViewer/OCCViewer.cxx
@@ -17,7 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <OCCViewer_Trihedron.h>
+#include "OCCViewer_Trihedron.h"
 
 #include <Graphic3d_CBounds.hxx>
 #include <OpenGl_GraphicDriver.hxx>

diff --git a/src/OCCViewer/OCCViewer_Trihedron.h b/src/OCCViewer/OCCViewer_Trihedron.h
index 5836264e1e1d9ac2330a17ee734391cdd573e931..5c2bfc88d6549b556c29e9812a83f06cd49fa258 100644 (file)
--- a/src/OCCViewer/OCCViewer_Trihedron.h
+++ b/src/OCCViewer/OCCViewer_Trihedron.h
@@ -19,7 +19,7 @@
 #ifndef OCCVIEWER_TRIHEDRON_H
 #define OCCVIEWER_TRIHEDRON_H
 
-#include <OCCViewer.h>
+#include "OCCViewer.h"
 
 #include <AIS_InteractiveObject.hxx>
 #include <Graphic3d_CBounds.hxx>

diff --git a/src/Plot2d/Plot2d_ToolTip.cxx b/src/Plot2d/Plot2d_ToolTip.cxx
index bf94e310f6970ac3043c6b50032d4d0af9e00d43..043c5c487887b02884f4b0ced06652f7365f33d8 100644 (file)
--- a/src/Plot2d/Plot2d_ToolTip.cxx
+++ b/src/Plot2d/Plot2d_ToolTip.cxx
@@ -19,9 +19,9 @@
 // File:      Plot2d_ToolTip.cxx
 // Author:    Alexandre SOLOVYOV
 
-#include <Plot2d_ToolTip.h>
-#include <Plot2d_ViewFrame.h>
-#include <Plot2d_Curve.h>
+#include "Plot2d_ToolTip.h"
+#include "Plot2d_ViewFrame.h"
+#include "Plot2d_Curve.h"
 
 #include <QFontMetrics>
 #include <QEvent>

diff --git a/src/Plot2d/Plot2d_ToolTip.h b/src/Plot2d/Plot2d_ToolTip.h
index c2f2d785f084785938cfde0cfe2d688999545122..06fcb70d18541c5a2bd52355407e383e11005c29 100644 (file)
--- a/src/Plot2d/Plot2d_ToolTip.h
+++ b/src/Plot2d/Plot2d_ToolTip.h
@@ -22,7 +22,7 @@
 #ifndef PLOT2D_TOOLTIP_H
 #define PLOT2D_TOOLTIP_H
 
-#include <Plot2d.h>
+#include "Plot2d.h"
 #include <QtxToolTip.h>
 
 class Plot2d_ViewFrame;

diff --git a/src/QxGraph/QxGraph_Prs.h b/src/QxGraph/QxGraph_Prs.h
index 16161031433d7d5fad4014a2397b787c974b7781..f93cea4458966f73d6eb4ca30c8a4aefcbbc4d4b 100644 (file)
--- a/src/QxGraph/QxGraph_Prs.h
+++ b/src/QxGraph/QxGraph_Prs.h
@@ -19,7 +19,7 @@
 #ifndef QXGRAPH_PRS_H
 #define QXGRAPH_PRS_H
 
-#include <QxGraph.h>
+#include "QxGraph.h"
 
 #include <qcanvas.h>
 #include <map>

diff --git a/src/SUIT/SUIT_DataBrowser.cxx b/src/SUIT/SUIT_DataBrowser.cxx
index 1f9e4d042f6c7dac487588a3ec7b2b6c450dae20..1444ab3577d5088b32a87ca2d7440ed876ed4959 100644 (file)
--- a/src/SUIT/SUIT_DataBrowser.cxx
+++ b/src/SUIT/SUIT_DataBrowser.cxx
@@ -21,7 +21,7 @@
 // 
 
 #include "SUIT_DataBrowser.h"
-#include <SUIT_TreeModel.h>
+#include "SUIT_TreeModel.h"
 #include <QtxTreeView.h>
 
 #include <QShortcut>

diff --git a/src/SUIT/SUIT_Session.h b/src/SUIT/SUIT_Session.h
index e6ece73e3447a46e9b2311c80962d6d6d38dd4ed..bc3ca3486693338c718cdaa77e3a2edfe4fa493f 100755 (executable)
--- a/src/SUIT/SUIT_Session.h
+++ b/src/SUIT/SUIT_Session.h
@@ -20,8 +20,7 @@
 #define SUIT_SESSION_H
 
 #include "SUIT.h"
-
-#include <SUIT_Application.h>
+#include "SUIT_Application.h"
 
 #include <QList>
 #include <QObject>

diff --git a/src/SUIT/SUIT_ViewManager.cxx b/src/SUIT/SUIT_ViewManager.cxx
index 34ee0c10ca3ae191fa068dc2af8b5045e560de83..ed32ea6f21c075877ff71d76d5415efd1110b1e0 100755 (executable)
--- a/src/SUIT/SUIT_ViewManager.cxx
+++ b/src/SUIT/SUIT_ViewManager.cxx
@@ -20,7 +20,7 @@
 
 #include "SUIT_Desktop.h"
 #include "SUIT_ViewModel.h"
-#include <SUIT_ViewWindow.h>
+#include "SUIT_ViewWindow.h"
 #include "SUIT_Study.h"
 
 #include <QMap>

diff --git a/src/SUIT/SUIT_ViewModel.cxx b/src/SUIT/SUIT_ViewModel.cxx
index 3ecd9eeaed81bf6afc7f699c598eec12ced72b21..038cb6bc3616e22494635dab1d5431383d6caa43 100755 (executable)
--- a/src/SUIT/SUIT_ViewModel.cxx
+++ b/src/SUIT/SUIT_ViewModel.cxx
@@ -20,8 +20,7 @@
 //
 
 #include "SUIT_ViewModel.h"
-
-#include <SUIT_ViewWindow.h>
+#include "SUIT_ViewWindow.h"
 
 SUIT_ViewModel::StatesMap SUIT_ViewModel::myStateMap;
 SUIT_ViewModel::ButtonsMap SUIT_ViewModel::myButtonMap;

diff --git a/src/SVTK/SVTK_Extension.h b/src/SVTK/SVTK_Extension.h
index 0b39e59f2afaa233cd4ef8dba97823814c4f0130..73619dd218398ca20719714d03f30c94c316b60b 100755 (executable)
--- a/src/SVTK/SVTK_Extension.h
+++ b/src/SVTK/SVTK_Extension.h
@@ -24,7 +24,7 @@
   Functions of loading OpenGL extensions.
 */
 
-#include <SVTK.h>
+#include "SVTK.h"
 
 namespace SVTK
 {

diff --git a/src/SVTK/SVTK_Prs.h b/src/SVTK/SVTK_Prs.h
index 7931972d4bd2e6691932dabbb8ef864109504c85..33285a78a4784a67ed26655f252cae6617cee443 100644 (file)
--- a/src/SVTK/SVTK_Prs.h
+++ b/src/SVTK/SVTK_Prs.h
@@ -29,7 +29,7 @@
 #ifndef SVTK_Prs_H
 #define SVTK_Prs_H
 
-#include <SVTK.h>
+#include "SVTK.h"
 #include "SALOME_Prs.h"
 
 class vtkActorCollection;

diff --git a/src/SVTK/SVTK_ViewModel.cxx b/src/SVTK/SVTK_ViewModel.cxx
index 954d39f8b0bbcf7d9bdc2bd540bde8d3fe3c296a..4fce1eb196a4b386c4feec7d1662ebf2f8823a79 100644 (file)
--- a/src/SVTK/SVTK_ViewModel.cxx
+++ b/src/SVTK/SVTK_ViewModel.cxx
@@ -37,7 +37,7 @@
 #include "SUIT_ViewModel.h"
 #include "SUIT_ViewManager.h"
 
-#include <SALOME_Actor.h>
+#include "SALOME_Actor.h"
 
 #include <QtxActionToolMgr.h>
 

diff --git a/src/SalomeApp/SalomeApp_CheckFileDlg.h b/src/SalomeApp/SalomeApp_CheckFileDlg.h
index 53e56683c2c1514292b069ab5f3de9fb2c3f9fdd..28f7f6e4df5ddd650547c16cdc2ea29bf1bee1f1 100644 (file)
--- a/src/SalomeApp/SalomeApp_CheckFileDlg.h
+++ b/src/SalomeApp/SalomeApp_CheckFileDlg.h
@@ -19,7 +19,7 @@
 #ifndef SALOMEAPP_CHECKFILEDIALOG_H
 #define SALOMEAPP_CHECKFILEDIALOG_H
 
-#include <SalomeApp.h>
+#include "SalomeApp.h"
 
 #include <SUIT_FileDlg.h>
 

diff --git a/src/Session/SalomeApp_Engine_i.hxx b/src/Session/SalomeApp_Engine_i.hxx
index abadbdd675167cb07b0c48abb1c777dac14ba299..baede8f53818ea2629746c9796d153f13c0fc0e0 100755 (executable)
--- a/src/Session/SalomeApp_Engine_i.hxx
+++ b/src/Session/SalomeApp_Engine_i.hxx
@@ -29,7 +29,7 @@
 #ifndef _SALOMEAPP_ENGINE_I_HXX_
 #define _SALOMEAPP_ENGINE_I_HXX_
 
-#include <SALOME_Session.hxx>
+#include "SALOME_Session.hxx"
 
 #include "SALOME_Component_i.hxx"
 

diff --git a/src/Session/Session_ServerLauncher.hxx b/src/Session/Session_ServerLauncher.hxx
index 6f0fede882def3a41b3218de73462b0e4cbc45e8..c81ec50dcc818b78ed2e1d9d3c346c0929d55e40 100755 (executable)
--- a/src/Session/Session_ServerLauncher.hxx
+++ b/src/Session/Session_ServerLauncher.hxx
@@ -29,7 +29,7 @@
 #ifndef _SESSION_SERVERLAUNCHER_HXX_
 #define _SESSION_SERVERLAUNCHER_HXX_
 
-#include <SALOME_Session.hxx>
+#include "SALOME_Session.hxx"
 
 #include <CORBA.h> 
 #include <list>

diff --git a/src/Session/Session_ServerThread.hxx b/src/Session/Session_ServerThread.hxx
index 146183da7897a69185a59dc087e6e3a36e007990..632ee0efddb0be9451871579e6f279e905bc768a 100755 (executable)
--- a/src/Session/Session_ServerThread.hxx
+++ b/src/Session/Session_ServerThread.hxx
@@ -29,7 +29,7 @@
 #ifndef _SESSION_SERVERTHREAD_HXX_
 #define _SESSION_SERVERTHREAD_HXX_
 
-#include <SALOME_Session.hxx>
+#include "SALOME_Session.hxx"
 
 #include <CORBA.h> 
 #include <string>

diff --git a/src/Session/Session_Session_i.hxx b/src/Session/Session_Session_i.hxx
index fc7a1e56e4f7cb7f55b275ff0231b15c6bd23b47..25e923417fda05428e828772e744c78cae639b6b 100755 (executable)
--- a/src/Session/Session_Session_i.hxx
+++ b/src/Session/Session_Session_i.hxx
@@ -29,7 +29,7 @@
 #ifndef _SESSION_SESSION_I_HXX_
 #define _SESSION_SESSION_I_HXX_
 
-#include <SALOME_Session.hxx>
+#include "SALOME_Session.hxx"
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Component)