From: eap <eap@opencascade.com>
Date: Fri, 15 Apr 2011 09:38:11 +0000 (+0000)
Subject: Restore support of med-2.1 in MEDWrapper
X-Git-Tag: V6_3_0a1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1f9d5836e71aac9c59192e955e63465940ef7a6f;p=modules%2Fvisu.git

Restore support of med-2.1 in MEDWrapper
---

diff --git a/src/CONVERTOR/Makefile.am b/src/CONVERTOR/Makefile.am
index 7ea4ec03..9cd1b523 100644
--- a/src/CONVERTOR/Makefile.am
+++ b/src/CONVERTOR/Makefile.am
@@ -98,7 +98,7 @@ libVisuConvertor_la_LDFLAGS= \
 	$(KERNEL_LDFLAGS) -lSALOMEBasics \
 	$(CAS_KERNEL) \
 	$(CAS_MATH) \
-	$(MED_LDFLAGS) -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapperBase \
+	$(MED_LDFLAGS) -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase \
 	$(GUI_LDFLAGS) -lVTKViewer
 
 # Executables targets
@@ -106,4 +106,4 @@ bin_PROGRAMS= VISUConvertor
 dist_VISUConvertor_SOURCES= VISUConvertor.cxx
 VISUConvertor_CPPFLAGS=$(libVisuConvertor_la_CPPFLAGS)
 VISUConvertor_LDADD=$(libVisuConvertor_la_LDFLAGS) \
-	-lMEDWrapper_V2_2 -lMEDWrapperBase -lMEDWrapper -lVTKViewer -lsuit -lqtx libVisuConvertor.la
+	-lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase -lMEDWrapper -lVTKViewer -lsuit -lqtx libVisuConvertor.la
diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index d52f8704..8ee84ca6 100644
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -1187,8 +1187,8 @@ namespace VISU
   MED::TInt
   GetPNOMLength(MED::EVersion theVersion)
   {
-//     if(theVersion == MED::eV2_1)
-//       return MED::GetPNOMLength<MED::eV2_1>();
+    if(theVersion == MED::eV2_1)
+      return MED::GetPNOMLength<MED::eV2_1>();
     return MED::GetPNOMLength<MED::eV2_2>();
   }
 
diff --git a/src/PIPELINE/Makefile.am b/src/PIPELINE/Makefile.am
index 301fca3c..5cae7e29 100644
--- a/src/PIPELINE/Makefile.am
+++ b/src/PIPELINE/Makefile.am
@@ -149,4 +149,4 @@ dist_VISU_img2vti_SOURCES= VISU_img2vti.cxx
 
 AM_CPPFLAGS+=$(libVisuPipeLine_la_CPPFLAGS)
 LDADD=$(libVisuPipeLine_la_LDFLAGS) libVisuPipeLine.la \
-	-lOpUtil -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapperBase -lsuit -lqtx -lSALOMEBasics -lvtkWidgets
+	-lOpUtil -lMEDWrapper -lMEDWrapper_V2_2  -lMEDWrapper_V2_1 -lMEDWrapperBase -lsuit -lqtx -lSALOMEBasics -lvtkWidgets
diff --git a/src/VISU_I/Makefile.am b/src/VISU_I/Makefile.am
index f247e230..a82b120b 100644
--- a/src/VISU_I/Makefile.am
+++ b/src/VISU_I/Makefile.am
@@ -215,5 +215,6 @@ VISU_I_LDADD=\
 	-lMEDWrapper \
 	-lMEDWrapperBase \
 	-lMEDWrapper_V2_2 \
+	-lMEDWrapper_V2_1 \
 	-lmedmem \
 	@CORBA_LIBS@