Patch for SALOME 7.3 (take into account removal of MEDMEM API) - from N.Crouzet

diff --git a/module_generator/hxxcompo.py b/module_generator/hxxcompo.py
index 1ae3a9d02a922a30736724cfc04cab4c1ed0dd37..b594ddd3fe342e003a4db976e9c8d8fe989f88c6 100644 (file)
--- a/module_generator/hxxcompo.py
+++ b/module_generator/hxxcompo.py
@@ -324,7 +324,6 @@ class HXX2SALOMEComponent(Component):
     if self.use_medcoupling:
         Compodefs+="""
 #include CORBA_CLIENT_HEADER(MEDCouplingCorbaServant)
-#include CORBA_CLIENT_HEADER(MED_Gen)
 #include "MEDCouplingFieldDoubleServant.hxx"
 #include "MEDCouplingUMeshServant.hxx"
 #include "MEDCouplingFieldDouble.hxx"

diff --git a/module_generator/salomemodules.py b/module_generator/salomemodules.py
index 4c0b05387832be50a6d16e8000a21789aeab087c..2acc3d9143b5f436d454e2fc11317ababee2abe2 100644 (file)
--- a/module_generator/salomemodules.py
+++ b/module_generator/salomemodules.py
@@ -62,8 +62,6 @@ add_module("GEOM",idldefs,makefiledefs,configdefs)
 
 #module MED
 idldefs="""
-#include "MED_Gen.idl"
-#include "MED.idl"
 #include "MEDCouplingCorbaServant.idl"
 """
 makefiledefs="""
@@ -71,7 +69,7 @@ makefiledefs="""
 MED_IDL_INCLUDES = -I$(MED_ROOT_DIR)/idl/salome
 MED_INCLUDES= -I${MED2HOME}/include -I${MED_ROOT_DIR}/include/salome -DH5_USE_16_API -I${HDF5HOME}/include
 MED_IDL_LIBS= -L$(MED_ROOT_DIR)/lib/salome -lSalomeIDLMED
-MED_LIBS= -L${MED2HOME}/lib -lmed -L${HDF5HOME}/lib -lhdf5 -L${MED_ROOT_DIR}/lib/salome -lSalomeIDLMED -lMEDClientcmodule -lmedcouplingcorba -lmedcouplingclient 
+MED_LIBS= -L${MED2HOME}/lib -lmed -L${HDF5HOME}/lib -lhdf5 -L${MED_ROOT_DIR}/lib/salome -lSalomeIDLMED -lmedcouplingcorba -lmedcouplingclient 
 SALOME_LIBS += ${MED_LIBS}
 SALOME_IDL_LIBS += ${MED_IDL_LIBS}
 SALOME_INCLUDES += ${MED_INCLUDES}