Improve build system: install each module's header files to the sub-directory of...

diff --git a/adm_local/unix/config_files/check_NETGENPLUGIN.m4 b/adm_local/unix/config_files/check_NETGENPLUGIN.m4
index 9ceac78d3a31305e4f4bf3bbf87d8aad5dd4f6d0..329fa60a09b8a2939cc3fc4dfa2f418b4f9e21dd 100644 (file)
--- a/adm_local/unix/config_files/check_NETGENPLUGIN.m4
+++ b/adm_local/unix/config_files/check_NETGENPLUGIN.m4
@@ -60,7 +60,7 @@ if test -f ${NETGENPLUGIN_DIR}/lib${LIB_LOCATION_SUFFIX}/salome/libNETGENEngine.
    AC_SUBST(NETGENPLUGIN_ROOT_DIR)
 
    NETGENPLUGIN_LDFLAGS=-L${NETGENPLUGIN_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
-   NETGENPLUGIN_CXXFLAGS=-I${NETGENPLUGIN_DIR}/include/salome
+   NETGENPLUGIN_CXXFLAGS="-I${NETGENPLUGIN_DIR}/include/salome -I${NETGENPLUGIN_DIR}/include/salome/skel"
 
    AC_SUBST(NETGENPLUGIN_LDFLAGS)
    AC_SUBST(NETGENPLUGIN_CXXFLAGS)

diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index cd851519b43b9a45f237e8476506361a49c93fb6..42063b9dc26affab98c1ddb999487d83da1b850c 100644 (file)
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -34,7 +34,8 @@ AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h
 # ============================================================
 # Standard directory for installation
 #
-salomeincludedir   = $(includedir)/salome
+salomeincludedir   = $(includedir)/salome/@MODULE_NAME@
+salomeskeldir      = $(includedir)/salome/skel
 libdir             = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome
 bindir             = $(prefix)/bin/salome
 salomescriptdir    = $(bindir)

diff --git a/idl/Makefile.am b/idl/Makefile.am
index de2be4351e5d3cf603de6c750d22508b8781dde8..2624ff07d3059db2fe9303bc6b64f37a2c5db194 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -38,7 +38,7 @@ lib_LTLIBRARIES = libSalomeIDLNETGENPLUGIN.la
 nodist_libSalomeIDLNETGENPLUGIN_la_SOURCES = NETGENPlugin_AlgorithmSK.cc
 
 # header files must be exported: other modules have to use this library
-nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
+nodist_salomeskel_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
 
 libSalomeIDLNETGENPLUGIN_la_CPPFLAGS = \
        $(KERNEL_CXXFLAGS) \

diff --git a/src/GUI/NETGENPluginGUI.cxx b/src/GUI/NETGENPluginGUI.cxx
index d4555475e7b61a2867db85ab27db7f2fe3d19f54..6d10611ac5c6063b71339869dc961c13e0497fa8 100755 (executable)
--- a/src/GUI/NETGENPluginGUI.cxx
+++ b/src/GUI/NETGENPluginGUI.cxx
@@ -24,7 +24,7 @@
 //  Author : Michael Zorin
 //  Module : NETGENPlugin
 //  $Header: 
-//#include "SMESHGUI_Hypotheses.h"
+//#include <smesh/SMESHGUI_Hypotheses.h>
 //
 #include "NETGENPluginGUI_HypothesisCreator.h"
 #include "NETGENPluginGUI_SimpleCreator.h"

diff --git a/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
index f3a1b7fc17ef572675b3c0caa26d60b2cac78e6d..c640f9f8ec208633b5d7f4f329e882ad1cacb283 100644 (file)
--- a/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
@@ -27,18 +27,18 @@
 //
 #include "NETGENPluginGUI_HypothesisCreator.h"
 
-#include <SMESHGUI_Utils.h>
-#include <SMESHGUI_HypothesesUtils.h>
-#include <SMESHGUI.h>
+#include <smesh/SMESHGUI_Utils.h>
+#include <smesh/SMESHGUI_HypothesesUtils.h>
+#include <smesh/SMESHGUI.h>
 
 #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm)
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <SalomeApp_Tools.h>
+#include <gui/SalomeApp_Tools.h>
 
-#include <SalomeApp_DoubleSpinBox.h>
+#include <gui/SalomeApp_DoubleSpinBox.h>
 
 #include <QComboBox>
 #include <QLabel>

diff --git a/src/GUI/NETGENPluginGUI_HypothesisCreator.h b/src/GUI/NETGENPluginGUI_HypothesisCreator.h
index a23739eee8b3e008bb815c9de4f940577f181afb..bb773cb4b7b99adb50c591289fa88c65429be6d8 100644 (file)
--- a/src/GUI/NETGENPluginGUI_HypothesisCreator.h
+++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.h
@@ -30,7 +30,7 @@
 
 #include "NETGENPluginGUI.h"
 
-#include <SMESHGUI_Hypotheses.h>
+#include <smesh/SMESHGUI_Hypotheses.h>
 
 class SalomeApp_DoubleSpinBox;
 class QComboBox;

diff --git a/src/GUI/NETGENPluginGUI_SimpleCreator.cxx b/src/GUI/NETGENPluginGUI_SimpleCreator.cxx
index 3a9c87172490470634dd044d6494f4341b015611..a88bdd104d49233ef1644dd57c7662747b4d2624 100644 (file)
--- a/src/GUI/NETGENPluginGUI_SimpleCreator.cxx
+++ b/src/GUI/NETGENPluginGUI_SimpleCreator.cxx
@@ -25,20 +25,20 @@
 //
 #include "NETGENPluginGUI_SimpleCreator.h"
 
-#include <SMESHGUI_Utils.h>
-#include <SMESHGUI_HypothesesUtils.h>
-#include <SMESHGUI_SpinBox.h>
-#include <SMESHGUI.h>
+#include <smesh/SMESHGUI_Utils.h>
+#include <smesh/SMESHGUI_HypothesesUtils.h>
+#include <smesh/SMESHGUI_SpinBox.h>
+#include <smesh/SMESHGUI.h>
 
 // IDL includes
 #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm)
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 // SALOME GUI includes
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_IntSpinBox.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_IntSpinBox.h>
 
 // Qt includes
 #include <QLabel>

diff --git a/src/GUI/NETGENPluginGUI_SimpleCreator.h b/src/GUI/NETGENPluginGUI_SimpleCreator.h
index 4b7bb88d57dfe5f3656fec82e3bbf78a91dcc5d1..f897c4dfd5a70bd7ef214dc0d9c67f8e3fd764a1 100644 (file)
--- a/src/GUI/NETGENPluginGUI_SimpleCreator.h
+++ b/src/GUI/NETGENPluginGUI_SimpleCreator.h
@@ -28,7 +28,7 @@
 
 #include "NETGENPluginGUI.h"
 // SMESH includes
-#include <SMESHGUI_Hypotheses.h>
+#include <smesh/SMESHGUI_Hypotheses.h>
 
 class  QCheckBox;
 class  QLineEdit;

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx
index f743919a7ffbea747c94726f82dbd897adb10635..84bfd51e84b0eb606e254fd84c4d908aa404b805 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx
@@ -26,7 +26,7 @@
 // Project   : SALOME
 //
 #include "NETGENPlugin_Hypothesis.hxx"
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx
index 3654f86102219ba4959a6d48fbd1dbb30f3d55af..f48e216a6087ec88870c5c9809796e8d78f89ff0 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx
@@ -30,8 +30,8 @@
 
 #include "NETGENPlugin_Defs.hxx"
 
-#include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <smesh/SMESH_Hypothesis.hxx>
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 //  Parameters for work of NETGEN
 //

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx
index 93dd11645a088d710eb8a453b38fafbf62b46024..616ac91a3d0d8e987140399f915d8b4cd0316134 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx
@@ -28,7 +28,7 @@
 //=============================================================================
 //
 #include "NETGENPlugin_Hypothesis_2D.hxx"
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx
index 07f1195d57c717c4a9b79c4a17e645cee046664f..aa54d22cc816b1b047b7b369b202945f159a2be2 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx
@@ -33,7 +33,7 @@
 #include "NETGENPlugin_Defs.hxx"
 
 #include "NETGENPlugin_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 //  Parameters for work of NETGEN.
 // This class is just to give 2D dimension, actually

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx
index cdb595c80b9e11ec42873f82219b134d106a045b..6d16cceeb3f3e10e932d33e8159da0c1fc053b5b 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx
@@ -28,11 +28,11 @@
 //=============================================================================
 //
 #include "NETGENPlugin_Hypothesis_2D_i.hxx"
-#include "SMESH_Gen.hxx"
-#include "SMESH_PythonDump.hxx"
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_PythonDump.hxx>
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx
index f13e9db5bd365942d6e1d774934654d5224a03e4..881d494658e31313dcc7e377319dd590990d7b87 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx
@@ -28,11 +28,11 @@
 //=============================================================================
 //
 #include "NETGENPlugin_Hypothesis_i.hxx"
-#include "SMESH_Gen.hxx"
-#include "SMESH_PythonDump.hxx"
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_PythonDump.hxx>
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx
index 94ad126536fc9abc67719e6c6c877207bee5f02a..cae1652c0238f027e5bd2907876f268e3b96944e 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx
@@ -35,7 +35,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm)
 
-#include "SMESH_Hypothesis_i.hxx"
+#include <smesh/SMESH_Hypothesis_i.hxx>
 #include "NETGENPlugin_Hypothesis.hxx"
 
 class SMESH_Gen;

diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
index 7a20b1a1071ba1d05c479b1fe523fdeca91b9f01..28b380528abb1c09d1f1e24ebfff07a3315520c8 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
@@ -30,15 +30,15 @@
 #include "NETGENPlugin_Hypothesis_2D.hxx"
 #include "NETGENPlugin_SimpleHypothesis_3D.hxx"
 
-#include <SMESH_Mesh.hxx>
-#include <SMESH_Comment.hxx>
-#include <SMESH_ComputeError.hxx>
-#include <SMESH_subMesh.hxx>
-#include <SMESH_MesherHelper.hxx>
-#include <SMESHDS_Mesh.hxx>
-#include <SMDS_MeshElement.hxx>
-#include <SMDS_MeshNode.hxx>
-#include <utilities.h>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/SMESH_Comment.hxx>
+#include <smesh/SMESH_ComputeError.hxx>
+#include <smesh/SMESH_subMesh.hxx>
+#include <smesh/SMESH_MesherHelper.hxx>
+#include <smesh/SMESHDS_Mesh.hxx>
+#include <smesh/SMDS_MeshElement.hxx>
+#include <smesh/SMDS_MeshNode.hxx>
+#include <kernel/utilities.h>
 
 #include <vector>
 #include <limits>

diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.hxx b/src/NETGENPlugin/NETGENPlugin_Mesher.hxx
index d10d771eca5b63f18406e7ffecf9a0c371fb4908..f24c8c564dca609696cdbb7529688fad0a37e5e8 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_Mesher.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_Mesher.hxx
@@ -29,7 +29,7 @@
 #define _NETGENPlugin_Mesher_HXX_
 
 #include "NETGENPlugin_Defs.hxx"
-#include "StdMeshers_FaceSide.hxx"
+#include <smesh/StdMeshers_FaceSide.hxx>
 #include <map>
 
 class SMESH_Mesh;

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx
index 331de00cd733ac77c183cb87256bc863bee82f87..26a73f3ea500ee00bf6aeed9ac8c607cea245976 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx
@@ -32,11 +32,11 @@
 #include "NETGENPlugin_SimpleHypothesis_2D.hxx"
 #include "NETGENPlugin_Mesher.hxx"
 
-#include <SMESH_Gen.hxx>
-#include <SMESH_Mesh.hxx>
-#include <SMESH_ControlsDef.hxx>
-#include <SMESHDS_Mesh.hxx>
-#include <utilities.h>
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/SMESH_ControlsDef.hxx>
+#include <smesh/SMESHDS_Mesh.hxx>
+#include <kernel/utilities.h>
 
 #include <list>
 

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx
index 7f6698861d2c5b4de49b14f6b3304cbd81168a52..3682efbb56faa6acb023ba7f22c726bdd98110e0 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx
@@ -32,10 +32,10 @@
 
 #include "NETGENPlugin_Defs.hxx"
 
-#include "SMESH_2D_Algo.hxx"
-#include "SMESH_Mesh.hxx"
-#include "StdMeshers_MaxElementVolume.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <smesh/SMESH_2D_Algo.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/StdMeshers_MaxElementVolume.hxx>
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 //class NETGENPlugin_Hypothesis_2D;
 

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx
index f16743622283d79083dfafbd97af5a5e3ef13bb1..07b89443a61bb8c1dc0c8f5576e55a3db19fe472 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx
@@ -32,11 +32,11 @@
 #include "NETGENPlugin_SimpleHypothesis_2D.hxx"
 #include "NETGENPlugin_Mesher.hxx"
 
-#include <SMESH_Gen.hxx>
-#include <SMESH_Mesh.hxx>
-#include <SMESH_ControlsDef.hxx>
-#include <SMESHDS_Mesh.hxx>
-#include <utilities.h>
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/SMESH_ControlsDef.hxx>
+#include <smesh/SMESHDS_Mesh.hxx>
+#include <kernel/utilities.h>
 
 #include <list>
 

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx
index 3740bb039c683593f259dd377a7acc6ff4747c52..43873952079e15c3df33949203d8018d35c12feb 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx
@@ -32,10 +32,10 @@
 
 #include "NETGENPlugin_Defs.hxx"
 
-#include "SMESH_3D_Algo.hxx"
-#include "SMESH_Mesh.hxx"
-#include "StdMeshers_MaxElementVolume.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <smesh/SMESH_3D_Algo.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/StdMeshers_MaxElementVolume.hxx>
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 //class NETGENPlugin_Hypothesis;
 

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx
index c15f825211f54f643532e5521a8a002ab7f67f55..363c33612a703a3f53db1cb7337e0525df2f81e7 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx
@@ -26,10 +26,10 @@
 //  $Header$
 //
 #include "NETGENPlugin_NETGEN_2D3D_i.hxx"
-#include "SMESH_Gen.hxx"
+#include <smesh/SMESH_Gen.hxx>
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.hxx
index 083deebb10dc6d09f9d79716fea9eb8af0e2cd13..28d7faed0f91e1f60bde5d7d1ceb02309776947f 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.hxx
@@ -33,7 +33,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm)
 
-#include "SMESH_3D_Algo_i.hxx"
+#include <smesh/SMESH_3D_Algo_i.hxx>
 #include "NETGENPlugin_NETGEN_2D3D.hxx"
 
 // ======================================================

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
index 5b2b2b83c0198027f73a4677313a8a21d1aa1a7e..6b802849701029555aeaa128aa4f461aeeb78e03 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
@@ -27,23 +27,23 @@
 
 #include "NETGENPlugin_Mesher.hxx"
 
-#include "SMDS_MeshElement.hxx"
-#include "SMDS_MeshNode.hxx"
-#include "SMESHDS_Mesh.hxx"
-#include "SMESH_Comment.hxx"
-#include "SMESH_Gen.hxx"
-#include "SMESH_Mesh.hxx"
-#include "SMESH_MesherHelper.hxx"
-#include "StdMeshers_FaceSide.hxx"
-#include "StdMeshers_MaxElementArea.hxx"
-#include "StdMeshers_LengthFromEdges.hxx"
-#include "StdMeshers_QuadranglePreference.hxx"
+#include <smesh/SMDS_MeshElement.hxx>
+#include <smesh/SMDS_MeshNode.hxx>
+#include <smesh/SMESHDS_Mesh.hxx>
+#include <smesh/SMESH_Comment.hxx>
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/SMESH_MesherHelper.hxx>
+#include <smesh/StdMeshers_FaceSide.hxx>
+#include <smesh/StdMeshers_MaxElementArea.hxx>
+#include <smesh/StdMeshers_LengthFromEdges.hxx>
+#include <smesh/StdMeshers_QuadranglePreference.hxx>
 
 #include <Precision.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <list>
 #include <vector>

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx
index 14b3b2cf6b5a8d286487f4aeed3f2507ff7ad026..4f8b5edc41e13c985ac3b04d389a69e5bac4e373 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx
@@ -26,8 +26,8 @@
 #ifndef _NETGENPlugin_NETGEN_2D_ONLY_HXX_
 #define _NETGENPlugin_NETGEN_2D_ONLY_HXX_
 
-#include "SMESH_2D_Algo.hxx"
-#include "SMESH_Mesh.hxx"
+#include <smesh/SMESH_2D_Algo.hxx>
+#include <smesh/SMESH_Mesh.hxx>
 
 /*#define OCCGEOMETRY
 #include <occgeom.hpp>

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx
index dfe93eba3cc640421479ac522614b7e7f50de67e..2f1b4f0b399f06ca7c90ddfc63798b61ac965abc 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx
@@ -25,9 +25,9 @@
 //  Module : SMESH
 //
 #include "NETGENPlugin_NETGEN_2D_ONLY_i.hxx"
-#include "SMESH_Gen.hxx"
+#include <smesh/SMESH_Gen.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 //=============================================================================
 /*!

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.hxx
index 125a5dc5d55d2f4e5ea874dfd6878ef5533ff83e..596b7328626161c9bfe5202cc7bf0331490f6389 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.hxx
@@ -30,7 +30,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm)
 
-#include "SMESH_2D_Algo_i.hxx"
+#include <smesh/SMESH_2D_Algo_i.hxx>
 #include "NETGENPlugin_NETGEN_2D_ONLY.hxx"
 
 // ======================================================

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx
index 3a113f6a4dda0bacf6a14483d0333d981ebac1c9..a097b801af7e8bcbb618d7af9307e9a9f446a503 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx
@@ -26,10 +26,10 @@
 //  $Header$
 //
 #include "NETGENPlugin_NETGEN_2D_i.hxx"
-#include "SMESH_Gen.hxx"
+#include <smesh/SMESH_Gen.hxx>
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx
index 984f9533148772e4b1e9e8117e86bfd46c648529..921df08bcdaecb6461ddc4145fd9cd87292436ce 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx
@@ -33,7 +33,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm)
 
-#include "SMESH_2D_Algo_i.hxx"
+#include <smesh/SMESH_2D_Algo_i.hxx>
 #include "NETGENPlugin_NETGEN_2D.hxx"
 
 // ======================================================

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
index 08fc384b10566bf1dded6292824b2bc68219b6af..29d1fb1ff72db0e3881dc90f884e79ea50f09ec6 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
@@ -31,16 +31,16 @@
 
 #include "NETGENPlugin_Mesher.hxx"
 
-#include "SMDS_MeshElement.hxx"
-#include "SMDS_MeshNode.hxx"
-#include "SMESHDS_Mesh.hxx"
-#include "SMESH_Comment.hxx"
-#include "SMESH_ControlsDef.hxx"
-#include "SMESH_Gen.hxx"
-#include "SMESH_Mesh.hxx"
-#include "SMESH_MesherHelper.hxx"
-#include "SMESH_MeshEditor.hxx"
-#include "StdMeshers_QuadToTriaAdaptor.hxx"
+#include <smesh/SMDS_MeshElement.hxx>
+#include <smesh/SMDS_MeshNode.hxx>
+#include <smesh/SMESHDS_Mesh.hxx>
+#include <smesh/SMESH_Comment.hxx>
+#include <smesh/SMESH_ControlsDef.hxx>
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/SMESH_MesherHelper.hxx>
+#include <smesh/SMESH_MeshEditor.hxx>
+#include <smesh/StdMeshers_QuadToTriaAdaptor.hxx>
 
 #include <BRep_Tool.hxx>
 #include <GProp_GProps.hxx>
@@ -52,7 +52,7 @@
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <list>
 #include <vector>

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
index c3f6be0542bc78ada6c57812d309b53b7996ad81..852ddd61da0a8b52c76f9f5d3520669ac1fee73b 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
@@ -33,10 +33,10 @@
 
 #include "NETGENPlugin_Defs.hxx"
 
-#include "SMESH_3D_Algo.hxx"
-#include "SMESH_Mesh.hxx"
-#include "StdMeshers_MaxElementVolume.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <smesh/SMESH_3D_Algo.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/StdMeshers_MaxElementVolume.hxx>
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D: public SMESH_3D_Algo
 {

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx
index e541cb6744e5b8fc9c17c9bd9f3a8f340421ce02..a4622fb6efc3436ac5e9f632220b496955836876 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx
@@ -27,10 +27,10 @@
 //  $Header$
 //
 #include "NETGENPlugin_NETGEN_3D_i.hxx"
-#include "SMESH_Gen.hxx"
+#include <smesh/SMESH_Gen.hxx>
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx
index cbc660b420573131cca3e7319208778f2cf8efeb..4763a8384fd97f59ae557e59395598db7fccf88b 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx
@@ -34,7 +34,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm)
 
-#include "SMESH_3D_Algo_i.hxx"
+#include <smesh/SMESH_3D_Algo_i.hxx>
 #include "NETGENPlugin_NETGEN_3D.hxx"
 
 // ======================================================

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx
index a54d2fbf35695d9ff07e0d68fe772a820d0a0346..12e52d44b8df5815c7bcdf29d1b21f1444dd9714 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx
@@ -28,13 +28,13 @@
 #include "NETGENPlugin_SimpleHypothesis_2D.hxx"
 #include "NETGENPlugin_Hypothesis.hxx"
 
-#include <SMESH_Mesh.hxx>
-#include <SMESH_subMesh.hxx>
-#include <SMESH_ControlsDef.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/SMESH_subMesh.hxx>
+#include <smesh/SMESH_ControlsDef.hxx>
 
 #include <TopExp_Explorer.hxx>
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx
index 4ed92181a184e633c48b89cd17b34f1ce83032fe..aa39413feb18f7932c1775c67b49a5842874fa8c 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx
@@ -30,8 +30,8 @@
 
 #include "NETGENPlugin_Defs.hxx"
 
-#include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <smesh/SMESH_Hypothesis.hxx>
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 //  Simplified parameters of NETGEN
 //

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx
index fac763ef12f1e52f63d209727ca0a5460632f6d4..260ea7d582c954a0b397b084ec930895b3bdbfa9 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx
@@ -28,11 +28,11 @@
 #include "NETGENPlugin_SimpleHypothesis_2D_i.hxx"
 #include "NETGENPlugin_SimpleHypothesis_2D.hxx"
 
-#include <SMESH_Gen.hxx>
-#include <SMESH_PythonDump.hxx>
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_PythonDump.hxx>
 
-#include <Utils_CorbaException.hxx>
-#include <utilities.h>
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx
index 54262931022d165669636aa4c427eebd06b6bc3d..ad8fec76ef8066a8f4d02e21a0e39a11584e789c 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx
@@ -33,7 +33,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm)
 
-#include "SMESH_Hypothesis_i.hxx"
+#include <smesh/SMESH_Hypothesis_i.hxx>
 
 class SMESH_Gen;
 class NETGENPlugin_SimpleHypothesis_2D;

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx
index fd799b9cb0c71459a92b2f5df3913f315c3b6244..ed86abffc24040fb33347d50da688b95719a2531 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx
@@ -28,13 +28,13 @@
 #include "NETGENPlugin_SimpleHypothesis_3D.hxx"
 #include "NETGENPlugin_Hypothesis.hxx"
 
-#include <SMESH_ControlsDef.hxx>
-#include <SMESH_Mesh.hxx>
-#include <SMESH_subMesh.hxx>
+#include <smesh/SMESH_ControlsDef.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/SMESH_subMesh.hxx>
 
 #include <TopExp_Explorer.hxx>
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx
index 7b7de4f172e67e6e9d7b5a44a224e1cdda431bd7..00d79759caf3dd62263e05cee69100bd5302d71f 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx
@@ -31,7 +31,7 @@
 #include "NETGENPlugin_Defs.hxx"
 #include "NETGENPlugin_SimpleHypothesis_2D.hxx"
 
-#include <Utils_SALOME_Exception.hxx>
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 //  Simplified parameters of NETGEN
 //

diff --git a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx
index 96b9aa861d11f2d7d4cbffe2cf06f9dec94cb978..a739048f4ec0e4ef0df7d5a3970c27ae9f121cee 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx
@@ -28,11 +28,11 @@
 #include "NETGENPlugin_SimpleHypothesis_3D_i.hxx"
 #include "NETGENPlugin_SimpleHypothesis_3D.hxx"
 
-#include <SMESH_Gen.hxx>
-#include <SMESH_PythonDump.hxx>
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_PythonDump.hxx>
 
-#include <Utils_CorbaException.hxx>
-#include <utilities.h>
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 

diff --git a/src/NETGENPlugin/NETGENPlugin_i.cxx b/src/NETGENPlugin/NETGENPlugin_i.cxx
index 78e77c14923d08bb30a58cf4abfbbc6ce6d0b510..6f2532d81161e5aef0697166f014177ad31b7a20 100644 (file)
--- a/src/NETGENPlugin/NETGENPlugin_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_i.cxx
@@ -25,7 +25,7 @@
 //  Module : SMESH
 //  $Header$
 //
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "NETGENPlugin_NETGEN_3D_i.hxx"
 #include "NETGENPlugin_NETGEN_2D_i.hxx"