From: akl Date: Mon, 15 Sep 2008 11:39:37 +0000 (+0000) Subject: Integration of 0019971: A patch for cmake compilation. X-Git-Tag: TG_TRIPOLI_qt4_porting~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=498b833223e09d517c6ab93c135d6391bd5aea0a;p=modules%2Fkernel.git Integration of 0019971: A patch for cmake compilation. --- diff --git a/src/Communication/MatrixClient.hxx b/src/Communication/MatrixClient.hxx index c26d6a751..d45a8534c 100644 --- a/src/Communication/MatrixClient.hxx +++ b/src/Communication/MatrixClient.hxx @@ -19,7 +19,7 @@ #ifndef __MATRIXCLIENT_HXX__ #define __MATRIXCLIENT_HXX__ -#include +#include "SALOME_Communication.hxx" #include #include CORBA_SERVER_HEADER(SALOME_Comm) diff --git a/src/Communication/MultiCommException.hxx b/src/Communication/MultiCommException.hxx index a6d4277bb..21d1eb117 100644 --- a/src/Communication/MultiCommException.hxx +++ b/src/Communication/MultiCommException.hxx @@ -20,7 +20,7 @@ #ifndef _MULTICOMMEXCEPTION_HXX_ #define _MULTICOMMEXCEPTION_HXX_ -#include +#include "SALOME_Communication.hxx" #include diff --git a/src/Communication/ReceiverFactory.hxx b/src/Communication/ReceiverFactory.hxx index 453430e66..b06bb5f2d 100644 --- a/src/Communication/ReceiverFactory.hxx +++ b/src/Communication/ReceiverFactory.hxx @@ -20,7 +20,7 @@ #ifndef _RECEIVERFACTORY_HXX_ #define _RECEIVERFACTORY_HXX_ -#include +#include "SALOME_Communication.hxx" #include #include CORBA_SERVER_HEADER(SALOME_Comm) diff --git a/src/Communication/SALOMEMultiComm.hxx b/src/Communication/SALOMEMultiComm.hxx index 52b43168c..8b4f2f1cc 100644 --- a/src/Communication/SALOMEMultiComm.hxx +++ b/src/Communication/SALOMEMultiComm.hxx @@ -20,7 +20,7 @@ #ifndef _SALOMEMULTICOMM_HXX_ #define _SALOMEMULTICOMM_HXX_ -#include +#include "SALOME_Communication.hxx" #include #include CORBA_SERVER_HEADER(SALOME_Comm) diff --git a/src/Communication/SALOME_Comm_i.hxx b/src/Communication/SALOME_Comm_i.hxx index 6664fc4c0..82306c86b 100644 --- a/src/Communication/SALOME_Comm_i.hxx +++ b/src/Communication/SALOME_Comm_i.hxx @@ -20,7 +20,7 @@ #ifndef _SALOME_COMM_I_HXX_ #define _SALOME_COMM_I_HXX_ -#include +#include "SALOME_Communication.hxx" #ifdef HAVE_MPI2 #include "mpi.h" diff --git a/src/Communication/SenderFactory.hxx b/src/Communication/SenderFactory.hxx index 86aa74875..af078e75c 100644 --- a/src/Communication/SenderFactory.hxx +++ b/src/Communication/SenderFactory.hxx @@ -20,7 +20,7 @@ #ifndef _SENDERFACTORY_HXX_ #define _SENDERFACTORY_HXX_ -#include +#include "SALOME_Communication.hxx" #include "MultiCommException.hxx" #include diff --git a/src/Container/Container_init_python.hxx b/src/Container/Container_init_python.hxx index d81ac5760..fd06be3ab 100644 --- a/src/Container/Container_init_python.hxx +++ b/src/Container/Container_init_python.hxx @@ -29,7 +29,7 @@ #ifndef _CONTAINER_INIT_PYTHON_HXX_ #define _CONTAINER_INIT_PYTHON_HXX_ -#include +#include "SALOME_Container.hxx" #include #include // must be before Python.h ! diff --git a/src/Container/SALOME_Component_i.hxx b/src/Container/SALOME_Component_i.hxx index 3d49b89c5..c4bfb042c 100644 --- a/src/Container/SALOME_Component_i.hxx +++ b/src/Container/SALOME_Component_i.hxx @@ -31,7 +31,7 @@ #include -#include +#include "SALOME_Container.hxx" #include #include diff --git a/src/Container/SALOME_ContainerManager.hxx b/src/Container/SALOME_ContainerManager.hxx index 869b9c235..9d25bce72 100644 --- a/src/Container/SALOME_ContainerManager.hxx +++ b/src/Container/SALOME_ContainerManager.hxx @@ -20,7 +20,7 @@ #ifndef __SALOME_CONTAINERMANAGER_HXX__ #define __SALOME_CONTAINERMANAGER_HXX__ -#include +#include "SALOME_Container.hxx" #include #include CORBA_CLIENT_HEADER(SALOME_Component) diff --git a/src/Container/SALOME_Container_i.hxx b/src/Container/SALOME_Container_i.hxx index 153b381f8..f9aef6033 100644 --- a/src/Container/SALOME_Container_i.hxx +++ b/src/Container/SALOME_Container_i.hxx @@ -29,7 +29,7 @@ #ifndef _SALOME_CONTAINER_I_HXX_ #define _SALOME_CONTAINER_I_HXX_ -#include +#include "SALOME_Container.hxx" #include #include CORBA_SERVER_HEADER(SALOME_Component) diff --git a/src/Container/SALOME_FileRef_i.hxx b/src/Container/SALOME_FileRef_i.hxx index 3e32964a5..646e863ff 100644 --- a/src/Container/SALOME_FileRef_i.hxx +++ b/src/Container/SALOME_FileRef_i.hxx @@ -26,7 +26,7 @@ #ifndef _SALOME_FILEREF_I_HXX_ #define _SALOME_FILEREF_I_HXX_ -#include +#include "SALOME_Container.hxx" #include #include CORBA_SERVER_HEADER(SALOME_Component) diff --git a/src/Container/SALOME_FileTransfer_i.hxx b/src/Container/SALOME_FileTransfer_i.hxx index f35a5582d..0e5c5d44f 100644 --- a/src/Container/SALOME_FileTransfer_i.hxx +++ b/src/Container/SALOME_FileTransfer_i.hxx @@ -27,7 +27,7 @@ #ifndef _SALOME_FILETRANSFER_I_HXX_ #define _SALOME_FILETRANSFER_I_HXX_ -#include +#include "SALOME_Container.hxx" #include #include CORBA_SERVER_HEADER(SALOME_Component) diff --git a/src/Container/Salome_file_i.hxx b/src/Container/Salome_file_i.hxx index b1337871f..b3b3503de 100644 --- a/src/Container/Salome_file_i.hxx +++ b/src/Container/Salome_file_i.hxx @@ -31,7 +31,7 @@ #include CORBA_SERVER_HEADER(SALOME_Component) #include CORBA_SERVER_HEADER(SALOME_Exception) -#include +#include "SALOME_Container.hxx" #include #include diff --git a/src/DSC/DSC_Basic/ConnectionManager_i.hxx b/src/DSC/DSC_Basic/ConnectionManager_i.hxx index 7696fc676..dfc08e70c 100644 --- a/src/DSC/DSC_Basic/ConnectionManager_i.hxx +++ b/src/DSC/DSC_Basic/ConnectionManager_i.hxx @@ -26,7 +26,7 @@ #ifndef _CONNECTION_MANAGER_I_HXX_ #define _CONNECTION_MANAGER_I_HXX_ -#include +#include "DSC_Basic.hxx" #include #include diff --git a/src/DSC/DSC_Basic/DSC_Callbacks.hxx b/src/DSC/DSC_Basic/DSC_Callbacks.hxx index ffdf57d76..55952fbc5 100644 --- a/src/DSC/DSC_Basic/DSC_Callbacks.hxx +++ b/src/DSC/DSC_Basic/DSC_Callbacks.hxx @@ -26,7 +26,7 @@ #ifndef _DSC_CALLBACKS_HXX_ #define _DSC_CALLBACKS_HXX_ -#include +#include "DSC_Basic.hxx" #include #include CORBA_SERVER_HEADER(DSC_Engines) diff --git a/src/DSC/DSC_Basic/DSC_i.hxx b/src/DSC/DSC_Basic/DSC_i.hxx index a66be1d56..7cc68c433 100644 --- a/src/DSC/DSC_Basic/DSC_i.hxx +++ b/src/DSC/DSC_Basic/DSC_i.hxx @@ -26,7 +26,7 @@ #ifndef _DSC_I_HXX_ #define _DSC_I_HXX_ -#include +#include "DSC_Basic.hxx" #include #include diff --git a/src/DSC/DSC_Basic/PortProperties_i.hxx b/src/DSC/DSC_Basic/PortProperties_i.hxx index 90d2132ce..e74a33dcf 100644 --- a/src/DSC/DSC_Basic/PortProperties_i.hxx +++ b/src/DSC/DSC_Basic/PortProperties_i.hxx @@ -26,7 +26,7 @@ #ifndef _PORTPROPERTIES_I_HXX_ #define _PORTPROPERTIES_I_HXX_ -#include +#include "DSC_Basic.hxx" #include #include CORBA_SERVER_HEADER(SALOME_Ports) diff --git a/src/DSC/DSC_User/Datastream/Calcium/Calcium.cxx b/src/DSC/DSC_User/Datastream/Calcium/Calcium.cxx index fde8203a8..983b33c4f 100644 --- a/src/DSC/DSC_User/Datastream/Calcium/Calcium.cxx +++ b/src/DSC/DSC_User/Datastream/Calcium/Calcium.cxx @@ -1,6 +1,6 @@ #include "Calcium.hxx" -#include -#include +#include "CalciumInterface.hxx" +#include "calcium.h" #include #include #include diff --git a/src/DSC/DSC_User/Datastream/Calcium/Makefile.am b/src/DSC/DSC_User/Datastream/Calcium/Makefile.am index da5a20b88..58454dc8f 100644 --- a/src/DSC/DSC_User/Datastream/Calcium/Makefile.am +++ b/src/DSC/DSC_User/Datastream/Calcium/Makefile.am @@ -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 \ diff --git a/src/DSC/DSC_User/Datastream/Calcium/calcium.h b/src/DSC/DSC_User/Datastream/Calcium/calcium.h index a1d87b295..10437a5b3 100644 --- a/src/DSC/DSC_User/Datastream/Calcium/calcium.h +++ b/src/DSC/DSC_User/Datastream/Calcium/calcium.h @@ -29,9 +29,9 @@ #ifndef __CALCIUM_H #define __CALCIUM_H -#include -#include -#include +#include "calciumE.h" +#include "version.h" +#include "calciumP.h" #if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus) #define CPNeedPrototype 1 diff --git a/src/DSC/DSC_User/Datastream/Calcium/calciumE.h b/src/DSC/DSC_User/Datastream/Calcium/calciumE.h index 49c9e57d8..d7a882c3e 100644 --- a/src/DSC/DSC_User/Datastream/Calcium/calciumE.h +++ b/src/DSC/DSC_User/Datastream/Calcium/calciumE.h @@ -29,7 +29,7 @@ #ifndef __CALCIUM_E_H #define __CALCIUM_E_H -#include +#include "calciumP.h" #if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus) #define CPNeedPrototype 1 diff --git a/src/DSC/DSC_User/Makefile.am b/src/DSC/DSC_User/Makefile.am index 7db5294da..fc1acd84b 100644 --- a/src/DSC/DSC_User/Makefile.am +++ b/src/DSC/DSC_User/Makefile.am @@ -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 \ diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx index 0c8661430..99732e6cf 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx @@ -29,7 +29,7 @@ #ifndef ACOMPONENT_IMPL_H #define ACOMPONENT_IMPL_H -#include +#include "SALOME_ModuleCatalog.hxx" #include "SALOME_ModuleCatalog_Parser.hxx" #include diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx index 50758d6a6..6e75a3f6e 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx @@ -29,7 +29,7 @@ #ifndef SALOME_CATALOG_HANDLER_H #define SALOME_CATALOG_HANDLER_H -#include +#include "SALOME_ModuleCatalog.hxx" #include "SALOME_ModuleCatalog_Parser.hxx" diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx index 40650ac9f..0caeb4089 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx @@ -30,7 +30,7 @@ #ifndef MODULECATALOG_IMPL_H #define MODULECATALOG_IMPL_H -#include +#include "SALOME_ModuleCatalog.hxx" #include #include diff --git a/src/NOTIFICATION_SWIG/Makefile.am b/src/NOTIFICATION_SWIG/Makefile.am index 5e1f7629a..0dd4b57df 100644 --- a/src/NOTIFICATION_SWIG/Makefile.am +++ b/src/NOTIFICATION_SWIG/Makefile.am @@ -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 \ diff --git a/src/Notification/NOTIFICATION.hxx b/src/Notification/NOTIFICATION.hxx index 04da6bfdf..fa0919bf0 100644 --- a/src/Notification/NOTIFICATION.hxx +++ b/src/Notification/NOTIFICATION.hxx @@ -28,7 +28,7 @@ #ifndef NOTIFICATION_HXX #define NOTIFICATION_HXX -#include +#include "SALOME_NOTIFICATION.hxx" #define NOTIF_WARNING "Warning" #define NOTIF_STEP "Step" diff --git a/src/Notification/NOTIFICATION_Consumer.hxx b/src/Notification/NOTIFICATION_Consumer.hxx index db5e04ccf..c8ea7fbc2 100644 --- a/src/Notification/NOTIFICATION_Consumer.hxx +++ b/src/Notification/NOTIFICATION_Consumer.hxx @@ -28,7 +28,7 @@ #ifndef NOTIFICATION_Consumer_HXX #define NOTIFICATION_Consumer_HXX -#include +#include "SALOME_NOTIFICATION.hxx" class NOTIFICATION_EXPORT NOTIFICATION_Consumer: public POA_CosNotifyComm::StructuredPullConsumer { public: diff --git a/src/Notification/NOTIFICATION_Supplier.hxx b/src/Notification/NOTIFICATION_Supplier.hxx index 058a70cde..0dbb03ca9 100644 --- a/src/Notification/NOTIFICATION_Supplier.hxx +++ b/src/Notification/NOTIFICATION_Supplier.hxx @@ -28,7 +28,7 @@ #ifndef NOTIFICATION_Supplier_HXX #define NOTIFICATION_Supplier_HXX -#include +#include "SALOME_NOTIFICATION.hxx" class NOTIFICATION_EXPORT NOTIFICATION_Supplier: public POA_CosNotifyComm::StructuredPushSupplier { public: diff --git a/src/Registry/RegistryConnexion.hxx b/src/Registry/RegistryConnexion.hxx index 510196d3f..fddb0b716 100644 --- a/src/Registry/RegistryConnexion.hxx +++ b/src/Registry/RegistryConnexion.hxx @@ -33,7 +33,7 @@ # if !defined( __RegistryConnexion_HXX__ ) # define __RegistryConnexion_HXX__ -#include +#include "SALOME_Registry.hxx" #include #include CORBA_CLIENT_HEADER(SALOME_Registry) diff --git a/src/Registry/RegistryService.hxx b/src/Registry/RegistryService.hxx index bc6097fcd..d1b3a81c2 100644 --- a/src/Registry/RegistryService.hxx +++ b/src/Registry/RegistryService.hxx @@ -29,7 +29,7 @@ # ifndef __RegistryService_h__ # define __RegistryService_h__ -#include +#include "SALOME_Registry.hxx" #include #include CORBA_SERVER_HEADER(SALOME_Registry) diff --git a/src/SALOMEDS/SALOMEDS.hxx b/src/SALOMEDS/SALOMEDS.hxx index ca022bf4b..66f187917 100644 --- a/src/SALOMEDS/SALOMEDS.hxx +++ b/src/SALOMEDS/SALOMEDS.hxx @@ -30,7 +30,7 @@ #ifndef SALOMEDS_HeaderFile #define SALOMEDS_HeaderFile -#include +#include "SALOMEDS_Defines.hxx" #include diff --git a/src/SALOMEDS/SALOMEDS_Driver_i.cxx b/src/SALOMEDS/SALOMEDS_Driver_i.cxx index 5c1d2344c..b04823b2d 100644 --- a/src/SALOMEDS/SALOMEDS_Driver_i.cxx +++ b/src/SALOMEDS/SALOMEDS_Driver_i.cxx @@ -20,7 +20,7 @@ #include "SALOMEDS_Driver_i.hxx" -#include +#include "SALOMEDS_TMPFile_i.hxx" #include "utilities.h" #include "SALOMEDS_SObject_i.hxx" #include "SALOMEDS_SComponent_i.hxx" diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx index a70e8a413..ad4b3aac4 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeStudyProperties.cxx @@ -21,7 +21,7 @@ // Author : Sergey RUIN // Module : SALOME -#include +#include "SALOMEDSImpl_AttributeStudyProperties.hxx" using namespace std; diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx index 39930f364..6b50ce29d 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributeTableOfString.cxx @@ -21,7 +21,7 @@ // Author : Sergey Ruin // Module : SALOME -#include +#include "SALOMEDSImpl_AttributeTableOfString.hxx" #include #include #include diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_ChildNodeIterator.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_ChildNodeIterator.cxx index b1cc1ffd6..904779a86 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_ChildNodeIterator.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_ChildNodeIterator.cxx @@ -23,7 +23,7 @@ // -#include +#include "SALOMEDSImpl_ChildNodeIterator.hxx" #define ChildNodeIterator_UpToBrother \ { \ diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Driver.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_Driver.hxx index ff2c0475d..a6ea569fe 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_Driver.hxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_Driver.hxx @@ -22,9 +22,9 @@ #include "SALOMEDSImpl_Defines.hxx" #include -#include -#include -#include +#include "SALOMEDSImpl_SComponent.hxx" +#include "SALOMEDSImpl_SObject.hxx" +#include "SALOMEDSImpl_TMPFile.hxx" class SALOMEDSIMPL_EXPORT SALOMEDSImpl_Driver diff --git a/src/Utils/OpUtil.hxx b/src/Utils/OpUtil.hxx index f8a5f1ab5..d3aafddc1 100644 --- a/src/Utils/OpUtil.hxx +++ b/src/Utils/OpUtil.hxx @@ -27,7 +27,7 @@ #ifndef _OPUTIL_HXX #define _OPUTIL_HXX -#include +#include "SALOME_Utils.hxx" #include diff --git a/src/Utils/Utils_ExceptHandlers.hxx b/src/Utils/Utils_ExceptHandlers.hxx index 018e9d827..ff40370f1 100644 --- a/src/Utils/Utils_ExceptHandlers.hxx +++ b/src/Utils/Utils_ExceptHandlers.hxx @@ -29,7 +29,7 @@ #ifndef Utils_ExceptHandlers_HeaderFile #define Utils_ExceptHandlers_HeaderFile -#include +#include "SALOME_Utils.hxx" #include diff --git a/src/Utils/Utils_Identity.hxx b/src/Utils/Utils_Identity.hxx index 5e508a47f..43c3d0428 100644 --- a/src/Utils/Utils_Identity.hxx +++ b/src/Utils/Utils_Identity.hxx @@ -29,7 +29,7 @@ # if !defined( __IDENTITE_H__ ) # define __IDENTITE_H__ -#include +#include "SALOME_Utils.hxx" extern "C" { diff --git a/src/Utils/Utils_Mutex.cxx b/src/Utils/Utils_Mutex.cxx index 88a0c5747..ff2dcc936 100644 --- a/src/Utils/Utils_Mutex.cxx +++ b/src/Utils/Utils_Mutex.cxx @@ -26,7 +26,7 @@ // $Header$ -#include +#include "Utils_Mutex.hxx" Utils_Mutex::Utils_Mutex() : myCount( 0 )