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 (from parent 1:
c188b10
)
Mantis issue 0021668: [CEA 564] MED2.1 to MED2.3
author
jfa
<jfa@opencascade.com>
Thu, 9 Aug 2012 11:22:19 +0000
(11:22 +0000)
committer
jfa
<jfa@opencascade.com>
Thu, 9 Aug 2012 11:22:19 +0000
(11:22 +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 c2a28f46a3d4ff7be67f0bd32fc224af306a0984..105565a7aa847429e613ef4066acb3833a733cce 100644
(file)
--- a/
src/CONVERTOR/Makefile.am
+++ b/
src/CONVERTOR/Makefile.am
@@
-15,12
+15,11
@@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
# VISU OBJECT : interactive object for VISU entities implementation
# File : Makefile.am
# Module : VISU
# VISU OBJECT : interactive object for VISU entities implementation
# File : Makefile.am
# Module : VISU
-#
+
include $(top_srcdir)/adm_local/unix/make_common_starter.am
lib_LTLIBRARIES = libVisuConvertor.la
include $(top_srcdir)/adm_local/unix/make_common_starter.am
lib_LTLIBRARIES = libVisuConvertor.la
@@
-98,7
+97,7
@@
libVisuConvertor_la_LDFLAGS= \
$(KERNEL_LDFLAGS) -lSALOMEBasics \
$(CAS_KERNEL) \
$(CAS_MATH) \
$(KERNEL_LDFLAGS) -lSALOMEBasics \
$(CAS_KERNEL) \
$(CAS_MATH) \
- $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper
_V2_1 -lMEDWrapper
Base \
+ $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapperBase \
$(GUI_LDFLAGS) -lVTKViewer
# Executables targets
$(GUI_LDFLAGS) -lVTKViewer
# Executables targets
@@
-106,4
+105,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 -lMEDWrapper
_V2_1 -lMEDWrapper
Base -lMEDWrapper -lVTKViewer -lsuit -lqtx libVisuConvertor.la
+ -lMEDWrapper_V2_2 -lMEDWrapperBase -lMEDWrapper -lVTKViewer -lsuit -lqtx libVisuConvertor.la
diff --git
a/src/CONVERTOR/VISU_MedConvertor.cxx
b/src/CONVERTOR/VISU_MedConvertor.cxx
index 9f82a50ec9c0575df13e7be843956561424352c6..a8ee294ef8230aa8e9c5fe4b501834fa47ee4292 100644
(file)
--- a/
src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/
src/CONVERTOR/VISU_MedConvertor.cxx
@@
-1193,8
+1193,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 55c0c695c2f892a3d2e313b25fac74f1f11dad44..ce8589246cab233ccdae4257b7733e5f8074fd89 100644
(file)
--- a/
src/PIPELINE/Makefile.am
+++ b/
src/PIPELINE/Makefile.am
@@
-15,12
+15,11
@@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
# VISU OBJECT : interactive object for VISU entities implementation
# File : Makefile.in
# Module : VISU
# VISU OBJECT : interactive object for VISU entities implementation
# File : Makefile.in
# Module : VISU
-#
+
include $(top_srcdir)/adm_local/unix/make_common_starter.am
lib_LTLIBRARIES= libVisuPipeLine.la
include $(top_srcdir)/adm_local/unix/make_common_starter.am
lib_LTLIBRARIES= libVisuPipeLine.la
@@
-145,4
+144,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
-lMEDWrapper_V2_1
-lMEDWrapperBase -lsuit -lqtx -lSALOMEBasics -lvtkWidgets
+ -lOpUtil -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapperBase -lsuit -lqtx -lSALOMEBasics -lvtkWidgets
diff --git
a/src/VISU_I/Makefile.am
b/src/VISU_I/Makefile.am
index eba2518d7035880c82cfac496c4938347cbc9bf5..851b7e5620ac6f21e986a3e1274ec70b846b3dec 100644
(file)
--- a/
src/VISU_I/Makefile.am
+++ b/
src/VISU_I/Makefile.am
@@
-15,12
+15,11
@@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
# File : Makefile.am
# Author : Alexey Petrov
# Module : VISU
# File : Makefile.am
# Author : Alexey Petrov
# Module : VISU
-#
+
include $(top_srcdir)/adm_local/unix/make_common_starter.am
# Libraries targets
include $(top_srcdir)/adm_local/unix/make_common_starter.am
# Libraries targets
@@
-215,6
+214,5
@@
VISU_I_LDADD=\
-lMEDWrapper \
-lMEDWrapperBase \
-lMEDWrapper_V2_2 \
-lMEDWrapper \
-lMEDWrapperBase \
-lMEDWrapper_V2_2 \
- -lMEDWrapper_V2_1 \
-lmedmem \
@CORBA_LIBS@
-lmedmem \
@CORBA_LIBS@