From: vsr Date: Fri, 18 Oct 2013 14:50:16 +0000 (+0000) Subject: Patch for SALOME 7.3 (take into account removal of MEDMEM API) - from N.Crouzet X-Git-Tag: V7_3_0a1~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a7a0618895f640e776baa1402106375ca6e980a4;p=tools%2Fyacsgen.git 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 1ae3a9d..b594ddd 100644 --- 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 4c0b053..2acc3d9 100644 --- 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}