Salome HOME
projects
/
modules
/
visu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4610ba9
)
Restore support of med-2.1 in MEDWrapper
V6_3_0a1
V6_main_20110418
V6_main_20110419
V6_main_20110420
V6_main_20110421
V6_main_20110422
V6_main_20110425
V6_main_20110426
V6_main_20110427
V6_main_20110428
before_mergefrom_V6_3_BR_06Jun11
author
eap
<eap@opencascade.com>
Fri, 15 Apr 2011 09:38:11 +0000
(09:38 +0000)
committer
eap
<eap@opencascade.com>
Fri, 15 Apr 2011 09:38:11 +0000
(09:38 +0000)
src/CONVERTOR/Makefile.am
patch
|
blob
|
history
src/CONVERTOR/VISU_MedConvertor.cxx
patch
|
blob
|
history
src/PIPELINE/Makefile.am
patch
|
blob
|
history
src/VISU_I/Makefile.am
patch
|
blob
|
history
diff --git
a/src/CONVERTOR/Makefile.am
b/src/CONVERTOR/Makefile.am
index 7ea4ec030d9690455e498a6d6e83a3a29fae8ff3..9cd1b523b3bf8f6320bd2d70f55f192009ba1b8d 100644
(file)
--- a/
src/CONVERTOR/Makefile.am
+++ b/
src/CONVERTOR/Makefile.am
@@
-98,7
+98,7
@@
libVisuConvertor_la_LDFLAGS= \
$(KERNEL_LDFLAGS) -lSALOMEBasics \
$(CAS_KERNEL) \
$(CAS_MATH) \
$(KERNEL_LDFLAGS) -lSALOMEBasics \
$(CAS_KERNEL) \
$(CAS_MATH) \
- $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapperBase \
+ $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper
_V2_1 -lMEDWrapper
Base \
$(GUI_LDFLAGS) -lVTKViewer
# Executables targets
$(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) \
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 -lMEDWrapper
Base -lMEDWrapper -lVTKViewer -lsuit -lqtx libVisuConvertor.la
diff --git
a/src/CONVERTOR/VISU_MedConvertor.cxx
b/src/CONVERTOR/VISU_MedConvertor.cxx
index d52f8704521c3f84ad4a9234019b69950fb661a5..8ee84ca66cb9c60100d6e4957264e4f4594d18f9 100644
(file)
--- a/
src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/
src/CONVERTOR/VISU_MedConvertor.cxx
@@
-1187,8
+1187,8
@@
namespace VISU
MED::TInt
GetPNOMLength(MED::EVersion theVersion)
{
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>();
}
return MED::GetPNOMLength<MED::eV2_2>();
}
diff --git
a/src/PIPELINE/Makefile.am
b/src/PIPELINE/Makefile.am
index 301fca3c1b2516e70fdcb4bc265a3fff5add88bd..5cae7e29ab77440018cc2dc5536bba210e0bb34c 100644
(file)
--- 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 \
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 f247e230d26076f8adb0e8a6993234e6dfd55678..a82b120bd9a9e0a42f53915adcb16f326dacb4ba 100644
(file)
--- 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 \
-lMEDWrapperBase \
-lMEDWrapper_V2_2 \
+ -lMEDWrapper_V2_1 \
-lmedmem \
@CORBA_LIBS@
-lmedmem \
@CORBA_LIBS@