]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
Integration of 0019971: A patch for cmake compilation.
authorakl <akl@opencascade.com>
Mon, 15 Sep 2008 11:39:37 +0000 (11:39 +0000)
committerakl <akl@opencascade.com>
Mon, 15 Sep 2008 11:39:37 +0000 (11:39 +0000)
41 files changed:
src/Communication/MatrixClient.hxx
src/Communication/MultiCommException.hxx
src/Communication/ReceiverFactory.hxx
src/Communication/SALOMEMultiComm.hxx
src/Communication/SALOME_Comm_i.hxx
src/Communication/SenderFactory.hxx
src/Container/Container_init_python.hxx
src/Container/SALOME_Component_i.hxx
src/Container/SALOME_ContainerManager.hxx
src/Container/SALOME_Container_i.hxx
src/Container/SALOME_FileRef_i.hxx
src/Container/SALOME_FileTransfer_i.hxx
src/Container/Salome_file_i.hxx
src/DSC/DSC_Basic/ConnectionManager_i.hxx
src/DSC/DSC_Basic/DSC_Callbacks.hxx
src/DSC/DSC_Basic/DSC_i.hxx
src/DSC/DSC_Basic/PortProperties_i.hxx
src/DSC/DSC_User/Datastream/Calcium/Calcium.cxx
src/DSC/DSC_User/Datastream/Calcium/Makefile.am
src/DSC/DSC_User/Datastream/Calcium/calcium.h
src/DSC/DSC_User/Datastream/Calcium/calciumE.h
src/DSC/DSC_User/Makefile.am
src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx
src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx
src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx
src/NOTIFICATION_SWIG/Makefile.am
src/Notification/NOTIFICATION.hxx
src/Notification/NOTIFICATION_Consumer.hxx
src/Notification/NOTIFICATION_Supplier.hxx
src/Registry/RegistryConnexion.hxx
src/Registry/RegistryService.hxx
src/SALOMEDS/SALOMEDS.hxx
src/SALOMEDS/SALOMEDS_Driver_i.cxx
src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx
src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx
src/SALOMEDSImpl/SALOMEDSImpl_ChildNodeIterator.cxx
src/SALOMEDSImpl/SALOMEDSImpl_Driver.hxx
src/Utils/OpUtil.hxx
src/Utils/Utils_ExceptHandlers.hxx
src/Utils/Utils_Identity.hxx
src/Utils/Utils_Mutex.cxx

index c26d6a751032be65f2ad0b1ab44c927d18c8a91c..d45a8534c084dcda43c82f92a05c8f22457f1634 100644 (file)
@@ -19,7 +19,7 @@
 #ifndef __MATRIXCLIENT_HXX__
 #define __MATRIXCLIENT_HXX__
 
-#include <SALOME_Communication.hxx>
+#include "SALOME_Communication.hxx"
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Comm)
index a6d4277bbbb1dc38cdd1ebaba8f5d3d3d56152d2..21d1eb11736e59c66e30424ac1ff79251c76e6e7 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef _MULTICOMMEXCEPTION_HXX_
 #define _MULTICOMMEXCEPTION_HXX_
 
-#include <SALOME_Communication.hxx>
+#include "SALOME_Communication.hxx"
 
 #include <string>
 
index 453430e66ca204303932cc0ecc83df188df661e0..b06bb5f2dea721af0c0bf022095549d57d4584c5 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef _RECEIVERFACTORY_HXX_
 #define _RECEIVERFACTORY_HXX_
 
-#include <SALOME_Communication.hxx>
+#include "SALOME_Communication.hxx"
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Comm)
index 52b43168ce21bf8cfc9c05be2f98b3b6f5569b62..8b4f2f1ccd043cdb8478a4f5de765996eb8ea3cb 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef _SALOMEMULTICOMM_HXX_
 #define _SALOMEMULTICOMM_HXX_
 
-#include <SALOME_Communication.hxx>
+#include "SALOME_Communication.hxx"
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Comm)
index 6664fc4c08bbadaef10c0fdd049ee073b96966f7..82306c86bb8b8d9ec032b537bf051ebd59ae75e6 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef _SALOME_COMM_I_HXX_
 #define _SALOME_COMM_I_HXX_
 
-#include <SALOME_Communication.hxx>
+#include "SALOME_Communication.hxx"
 
 #ifdef HAVE_MPI2
 #include "mpi.h"
index 86aa74875f2d22690f88fcbe9728b8684473a128..af078e75c15f38655039342dcd55e1d550789ab5 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef _SENDERFACTORY_HXX_
 #define _SENDERFACTORY_HXX_
 
-#include <SALOME_Communication.hxx>
+#include "SALOME_Communication.hxx"
 
 #include "MultiCommException.hxx"
 #include <SALOMEconfig.h>
index d81ac5760aadb50a3e8111872361d048d0346af9..fd06be3abe8e184d1fbda9c51c2f849373439d73 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef _CONTAINER_INIT_PYTHON_HXX_
 #define _CONTAINER_INIT_PYTHON_HXX_
 
-#include <SALOME_Container.hxx>
+#include "SALOME_Container.hxx"
 #include <SALOMEconfig.h>
 
 #include <pthread.h>  // must be before Python.h !
index 3d49b89c528a0342ba98a61c92e3f9b0dd7a3d5b..c4bfb042c2bed425848e336a32ba885ab68aebd3 100644 (file)
@@ -31,7 +31,7 @@
 
 #include <SALOMEconfig.h>
 
-#include <SALOME_Container.hxx>
+#include "SALOME_Container.hxx"
 
 #include <iostream>
 #include <signal.h>
index 869b9c23514e9e3b376df6a93831c6eab7198bb2..9d25bce72f4d2a7cf112f673ccd26a64950be959 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef __SALOME_CONTAINERMANAGER_HXX__
 #define __SALOME_CONTAINERMANAGER_HXX__
 
-#include <SALOME_Container.hxx>
+#include "SALOME_Container.hxx"
 
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SALOME_Component)
index 153b381f84d8820656b3f04d66559535e8a1d98d..f9aef6033c95c042efddf233484eb43a80b336ea 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef _SALOME_CONTAINER_I_HXX_
 #define _SALOME_CONTAINER_I_HXX_
 
-#include <SALOME_Container.hxx>
+#include "SALOME_Container.hxx"
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Component)
index 3e32964a53025dffdf256f80f97113650e8cf754..646e863ff58434bc22a7ad86899c3063b66a8f5d 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef _SALOME_FILEREF_I_HXX_
 #define _SALOME_FILEREF_I_HXX_
 
-#include <SALOME_Container.hxx>
+#include "SALOME_Container.hxx"
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Component)
index f35a5582da23c38675d770f3e67dba058cc10eaf..0e5c5d44faf47839fb4f50b914dac47c321ff855 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef _SALOME_FILETRANSFER_I_HXX_
 #define _SALOME_FILETRANSFER_I_HXX_
 
-#include <SALOME_Container.hxx>
+#include "SALOME_Container.hxx"
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Component)
index b1337871fef2a5bc2e71b8ddae0ee06757fab3d8..b3b3503de70f602a63e6aac1e287907c8a9ba756 100644 (file)
@@ -31,7 +31,7 @@
 #include CORBA_SERVER_HEADER(SALOME_Component)
 #include CORBA_SERVER_HEADER(SALOME_Exception)
 
-#include <SALOME_Container.hxx>
+#include "SALOME_Container.hxx"
 #include <map>
 #include <cstdio>
 
index 7696fc676e2942f61e3ab6a1f62ae150c57d814a..dfc08e70c23feff021f3b4ae7e887e676882a39b 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef _CONNECTION_MANAGER_I_HXX_
 #define _CONNECTION_MANAGER_I_HXX_
 
-#include <DSC_Basic.hxx>
+#include "DSC_Basic.hxx"
 
 #include <iostream>
 #include <map>
index ffdf57d767d06f7bc0422209ab6c3b0561b59dfc..55952fbc53be9c073ab17fa6608aa1ad5b4b45b0 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef _DSC_CALLBACKS_HXX_
 #define _DSC_CALLBACKS_HXX_
 
-#include <DSC_Basic.hxx>
+#include "DSC_Basic.hxx"
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(DSC_Engines)
index a66be1d56e039c1b5df37696b18af74dd40f7c0f..7cc68c4330fe46516b50a0df07d6fc2399cfcf7c 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef _DSC_I_HXX_
 #define _DSC_I_HXX_
 
-#include <DSC_Basic.hxx>
+#include "DSC_Basic.hxx"
 
 #include <iostream>
 #include <map>
index 90d2132cefecbc8d8b4ab555db3566b3597321a5..e74a33dcf117c220707bfdbc6578cc38e09ac580 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef _PORTPROPERTIES_I_HXX_
 #define _PORTPROPERTIES_I_HXX_
 
-#include <DSC_Basic.hxx>
+#include "DSC_Basic.hxx"
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Ports)
index fde8203a883a32ef91b1556435fce8ae0c7c9f9e..983b33c4f71fb2e303923f2c5112de5a17005659 100644 (file)
@@ -1,6 +1,6 @@
 #include "Calcium.hxx"
-#include <CalciumInterface.hxx>
-#include <calcium.h>
+#include "CalciumInterface.hxx"
+#include "calcium.h"
 #include <iostream>
 #include <string>
 #include <exception>
index da5a20b880e3e1aa6dfcd7720f3247546315b521..58454dc8f3d592a8441b42f322158c852ffd3168 100644 (file)
@@ -69,7 +69,7 @@ EXTRA_DIST=fortoc.h
 #
 
 # This local variable defines the list of CPPFLAGS common to all target in this package.
-COMMON_CPPFLAGS= -I$(top_srcdir)/src/DSC/DSC_User \
+COMMON_CPPFLAGS= -I$(srcdir) -I$(top_srcdir)/src/DSC/DSC_User \
                 -I$(top_srcdir)/src/DSC/DSC_User/Datastream \
                 -I$(top_srcdir)/src/DSC/DSC_User/Datastream/Palm \
                 -I$(top_srcdir)/src/DSC/DSC_User/Basic \
index a1d87b29502494bff57ea0ea32f1ee4de8f6555e..10437a5b355538f0c9ae348e43565854ca6416e1 100644 (file)
@@ -29,9 +29,9 @@
 #ifndef __CALCIUM_H
 #define __CALCIUM_H
 
-#include <calciumE.h>
-#include <version.h>
-#include <calciumP.h>
+#include "calciumE.h"
+#include "version.h"
+#include "calciumP.h"
 
 #if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)
 #define CPNeedPrototype        1
index 49c9e57d84c1e3568e4c7cbb98397e2a732cc56d..d7a882c3e970a15ae0d2f93606c1e5e6ecd6de0c 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef __CALCIUM_E_H
 #define __CALCIUM_E_H
 
-#include <calciumP.h>
+#include "calciumP.h"
 
 #if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)
 #define CPNeedPrototype        1
index 7db5294daec9ac89308f0ba181e1b430249349fa..fc1acd84b22e1dec78b656aa70682d253417e2b5 100644 (file)
@@ -46,7 +46,7 @@ salomeinclude_HEADERS = base_port.hxx \
 #
 
 # This local variable defines the list of CPPFLAGS common to all target in this package.
-COMMON_CPPFLAGS= -I$(srcdir)/Basic \
+COMMON_CPPFLAGS= -I$(srcdir) -I$(srcdir)/Basic \
                 -I$(srcdir)/Datastream  \
                 -I$(srcdir)/Datastream/Palm \
                 -I$(srcdir)/Datastream/Calcium \
index 0c8661430a20fd793fa9e320544961c659c3543a..99732e6cf1161c58dea6e16d44a6d410521e5b50 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef ACOMPONENT_IMPL_H
 #define ACOMPONENT_IMPL_H
 
-#include <SALOME_ModuleCatalog.hxx>
+#include "SALOME_ModuleCatalog.hxx"
 
 #include "SALOME_ModuleCatalog_Parser.hxx"
 #include <SALOMEconfig.h>
index 50758d6a6e4cef3d8fa676eff6ff28cf7aa1a56d..6e75a3f6e44fe2f53b840a7e9b11268b188ff565 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef SALOME_CATALOG_HANDLER_H
 #define SALOME_CATALOG_HANDLER_H
 
-#include <SALOME_ModuleCatalog.hxx>
+#include "SALOME_ModuleCatalog.hxx"
 
 #include "SALOME_ModuleCatalog_Parser.hxx"
 
index 40650ac9f751a2d0312a2de570b0dbe7ff638855..0caeb4089325250cfbd61c38a802a1de0276831a 100644 (file)
@@ -30,7 +30,7 @@
 #ifndef MODULECATALOG_IMPL_H
 #define MODULECATALOG_IMPL_H
 
-#include <SALOME_ModuleCatalog.hxx>
+#include "SALOME_ModuleCatalog.hxx"
 
 #include <string>
 #include <map>
index 5e1f7629ae8af1d63e41aadb829870a5a498afd4..0dd4b57df8a7e1c47949b3440f6eca30d2e54596 100644 (file)
@@ -46,6 +46,7 @@ _libNOTIFICATION_la_SOURCES  = $(SWIG_SOURCES) \
        NOTIFICATION_Swig.cxx NOTIFICATION_Swig.hxx SALOME_NOTIFICATION_SWIG.hxx
 _libNOTIFICATION_la_CPPFLAGS =\
        @PYTHON_INCLUDES@ -DHAVE_CONFIG_H \
+       -I$(srcdir) \
        -I$(srcdir)/../Notification \
        -I$(srcdir)/../Basics \
        -I$(srcdir)/../SALOMELocalTrace \
index 04da6bfdf3722b0ab53319b5c9056f91fd924c83..fa0919bf0edde5bca27cb58a105cd7ebc23a5605 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef NOTIFICATION_HXX
 #define NOTIFICATION_HXX
 
-#include <SALOME_NOTIFICATION.hxx>
+#include "SALOME_NOTIFICATION.hxx"
 
 #define NOTIF_WARNING "Warning"
 #define NOTIF_STEP    "Step"
index db5e04ccf32c7838b34ab2f0a71ed74b36525f8a..c8ea7fbc220e6593858f09a809b52b9d68011d83 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef NOTIFICATION_Consumer_HXX
 #define NOTIFICATION_Consumer_HXX
 
-#include <SALOME_NOTIFICATION.hxx>
+#include "SALOME_NOTIFICATION.hxx"
 
 class NOTIFICATION_EXPORT NOTIFICATION_Consumer: public POA_CosNotifyComm::StructuredPullConsumer {
   public:
index 058a70cdee0a46ca355e2b1c186352574cab4635..0dbb03ca9530578103dbc860170d8337eb6b1880 100644 (file)
@@ -28,7 +28,7 @@
 #ifndef NOTIFICATION_Supplier_HXX
 #define NOTIFICATION_Supplier_HXX
 
-#include <SALOME_NOTIFICATION.hxx>
+#include "SALOME_NOTIFICATION.hxx"
 
 class NOTIFICATION_EXPORT NOTIFICATION_Supplier: public POA_CosNotifyComm::StructuredPushSupplier {
   public:
index 510196d3f068fd546fa0285718878fdadd63d361..fddb0b7161c76cc323b59a598536d826c953fb75 100644 (file)
@@ -33,7 +33,7 @@
 # if !defined( __RegistryConnexion_HXX__ )
 # define __RegistryConnexion_HXX__
 
-#include <SALOME_Registry.hxx>
+#include "SALOME_Registry.hxx"
 
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SALOME_Registry)
index bc6097fcd92261a1657fb6adeac8af5f11049a01..d1b3a81c21d1d13d27a19b57e9c7ada461b16537 100644 (file)
@@ -29,7 +29,7 @@
 # ifndef __RegistryService_h__
 # define __RegistryService_h__
 
-#include <SALOME_Registry.hxx>
+#include "SALOME_Registry.hxx"
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Registry)
index ca022bf4b5118285d344214f4c237e72a0b754b4..66f187917b26ca7fe686fc7a6471f89bb099c72a 100644 (file)
@@ -30,7 +30,7 @@
 #ifndef SALOMEDS_HeaderFile
 #define SALOMEDS_HeaderFile
 
-#include <SALOMEDS_Defines.hxx>
+#include "SALOMEDS_Defines.hxx"
 
 #include <Utils_Mutex.hxx>
 
index 5c1d2344c750a8138b517c7eb79b82802a2e70a0..b04823b2de77a8d53fe57c594dda694366fb3ba7 100644 (file)
@@ -20,7 +20,7 @@
 
 
 #include "SALOMEDS_Driver_i.hxx"
-#include <SALOMEDS_TMPFile_i.hxx>
+#include "SALOMEDS_TMPFile_i.hxx"
 #include "utilities.h"
 #include "SALOMEDS_SObject_i.hxx"
 #include "SALOMEDS_SComponent_i.hxx"
index a70e8a413d054096b6a3a4c0a0197c54f35455e1..ad4b3aac4257793c21530f1d83ef4bab5fcf1abc 100644 (file)
@@ -21,7 +21,7 @@
 //  Author : Sergey RUIN
 //  Module : SALOME
 
-#include <SALOMEDSImpl_AttributeStudyProperties.hxx>
+#include "SALOMEDSImpl_AttributeStudyProperties.hxx"
 
 using namespace std;
 
index 39930f364955f3acd1c177bfa808b8651d08caa4..6b50ce29dd5d2cb5c597d9ed8accd79423d69479 100644 (file)
@@ -21,7 +21,7 @@
 //  Author : Sergey Ruin
 //  Module : SALOME
 
-#include <SALOMEDSImpl_AttributeTableOfString.hxx>
+#include "SALOMEDSImpl_AttributeTableOfString.hxx"
 #include <stdio.h>
 #include <stdlib.h>
 #include <strstream>
index b1cc1ffd6ac14c7baaf8f55718663dc584cce2b0..904779a866aa219d0ef4da10ea2d75bbbbdc1b8c 100644 (file)
@@ -23,7 +23,7 @@
 //             <dp@dingox.paris1.matra-dtv.fr>
 
 
-#include <SALOMEDSImpl_ChildNodeIterator.hxx>
+#include "SALOMEDSImpl_ChildNodeIterator.hxx"
 
 #define ChildNodeIterator_UpToBrother \
 { \
index ff2c0475deb04d60d873406415c05eaf2b74b539..a6ea569fe5d70cf68c7119a578a021cac9d2c0f1 100644 (file)
@@ -22,9 +22,9 @@
 
 #include "SALOMEDSImpl_Defines.hxx"
 #include <string>
-#include <SALOMEDSImpl_SComponent.hxx>
-#include <SALOMEDSImpl_SObject.hxx>
-#include <SALOMEDSImpl_TMPFile.hxx>
+#include "SALOMEDSImpl_SComponent.hxx"
+#include "SALOMEDSImpl_SObject.hxx"
+#include "SALOMEDSImpl_TMPFile.hxx"
 
 
 class SALOMEDSIMPL_EXPORT SALOMEDSImpl_Driver
index f8a5f1ab5150aa65eb0f233db74c8f1f336e8393..d3aafddc1f2a3f7b2048b1af59d5677501fabbe6 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef _OPUTIL_HXX
 #define _OPUTIL_HXX
 
-#include <SALOME_Utils.hxx>
+#include "SALOME_Utils.hxx"
 
 #include <string>
 
index 018e9d82793de3cf003722395438ab9d6d5376bd..ff40370f14abfa7676efb67f20e35bbd0cfcef55 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef Utils_ExceptHandlers_HeaderFile
 #define Utils_ExceptHandlers_HeaderFile
 
-#include <SALOME_Utils.hxx>
+#include "SALOME_Utils.hxx"
 
 #include <stdexcept>
 
index 5e508a47ffd4660629baae61cf470499b2aa7d52..43c3d0428ef18ccf368db7e7c36c6d5edc72cad3 100644 (file)
@@ -29,7 +29,7 @@
 # if !defined(  __IDENTITE_H__ )
 # define __IDENTITE_H__
 
-#include <SALOME_Utils.hxx>
+#include "SALOME_Utils.hxx"
 
 extern "C"
 {
index 88a0c5747b1a38983614c0e669463302ceaca3f4..ff2dcc9364e94e44482560c8fe554795e41d3e1a 100644 (file)
@@ -26,7 +26,7 @@
 //  $Header$
 
 
-#include <Utils_Mutex.hxx>
+#include "Utils_Mutex.hxx"
 
 Utils_Mutex::Utils_Mutex() 
 : myCount( 0 )