From 944af78798b2f5e6611438515db450cb77697fd9 Mon Sep 17 00:00:00 2001 From: eap Date: Fri, 15 Apr 2011 09:31:45 +0000 Subject: [PATCH] Restore support of med-2.1 in MEDWrapper --- src/DriverMED/DriverMED_Family.cxx | 6 +++--- src/DriverMED/Makefile.am | 5 +++-- src/SMESHClient/Makefile.am | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/DriverMED/DriverMED_Family.cxx b/src/DriverMED/DriverMED_Family.cxx index f8e91f956..0f0f5709f 100644 --- a/src/DriverMED/DriverMED_Family.cxx +++ b/src/DriverMED/DriverMED_Family.cxx @@ -329,9 +329,9 @@ DriverMED_Family::GetFamilyInfo(const MED::PWrapper& theWrapper, string aValue = aStr.str(); // PAL19785,0019867 - med forbids whitespace to be the last char in the name int maxSize; -// if ( theWrapper->GetVersion() == MED::eV2_1 ) -// maxSize = MED::GetNOMLength(); -// else + if ( theWrapper->GetVersion() == MED::eV2_1 ) + maxSize = MED::GetNOMLength(); + else maxSize = MED::GetNOMLength(); int lastCharPos = min( maxSize, (int) aValue.size() ) - 1; while ( isspace( aValue[ lastCharPos ] )) diff --git a/src/DriverMED/Makefile.am b/src/DriverMED/Makefile.am index 97c53f576..42237c26e 100644 --- a/src/DriverMED/Makefile.am +++ b/src/DriverMED/Makefile.am @@ -70,7 +70,7 @@ libMeshDriverMED_la_CPPFLAGS = \ libMeshDriverMED_la_LDFLAGS = \ $(BOOST_LIBS) \ ../Driver/libMeshDriver.la \ - $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_2 + $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 MED_Test_CPPFLAGS = \ @@ -88,5 +88,6 @@ MED_Test_LDADD = \ $(MED_LDFLAGS) \ -lMEDWrapper \ -lMEDWrapperBase \ - -lMEDWrapper_V2_2 + -lMEDWrapper_V2_2 \ + -lMEDWrapper_V2_1 diff --git a/src/SMESHClient/Makefile.am b/src/SMESHClient/Makefile.am index ecca968f5..01590a5be 100644 --- a/src/SMESHClient/Makefile.am +++ b/src/SMESHClient/Makefile.am @@ -69,7 +69,7 @@ libSMESHClient_la_LDFLAGS = \ $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics \ -lSalomeIDLKernel -lSALOMELocalTrace \ $(GEOM_LDFLAGS) -lNMTDS -lSalomeIDLGEOM \ - $(MED_LDFLAGS) -lMEDWrapper_V2_2 -lSalomeIDLMED -lMEDWrapper \ + $(MED_LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lSalomeIDLMED -lMEDWrapper \ $(CAS_KERNEL) SMESHClientBin_CPPFLAGS = \ -- 2.30.2