ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-14 02:30:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

PR: synchro V7_main tag mergefrom_V6_main_11Feb13

Browse Source
This commit is contained in:
prascle 2013-02-20 15:39:30 +00:00
parent 7f3c1cde92
commit 36cfe45a94
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -24,7 +24,7 @@
# Modified by : Alexander BORODIN (OCN) - autotools usage
# Created from configure.in.base
#
AC_INIT([Salome2 Project SMESH module], [6.6.0], [webmaster.salome@opencascade.com], [SalomeSMESH])
AC_INIT([Salome2 Project SMESH module], [7.0.0], [webmaster.salome@opencascade.com], [SalomeSMESH])
AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET

6
src/DriverMED/DriverMED_Family.cxx
View File

@ -357,9 +357,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<MED::eV2_1>();
else
//if ( theWrapper->GetVersion() == MED::eV2_1 )
// maxSize = MED::GetNOMLength<MED::eV2_1>();
//else
maxSize = MED::GetNOMLength<MED::eV2_2>();
int lastCharPos = min( maxSize, (int) aValue.size() ) - 1;
while ( isspace( aValue[ lastCharPos ] ))

12
src/DriverMED/Makefile.am
View File

@ -15,15 +15,13 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# SMESH DriverMED : driver to read and write 'med' files
# File : Makefile.in
# Author : Marc Tajchman (CEA)
# Modified by : Alexander BORODIN (OCN) - autotools usage
# Module : SMESH
# $Header$
#
include $(top_srcdir)/adm_local/unix/make_common_starter.am
# header files
@ -63,10 +61,9 @@ libMeshDriverMED_la_CPPFLAGS = \
libMeshDriverMED_la_LDFLAGS = \
$(BOOST_LIBS) \
../Driver/libMeshDriver.la \
$(MED_LDFLAGS) -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 \
$(MED_LDFLAGS) -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_2
$(BOOST_LIB_SYSTEM)
MED_Test_CPPFLAGS = \
$(libMeshDriverMED_la_CPPFLAGS)
@ -75,6 +72,7 @@ MED_Test_LDADD = \
../Driver/libMeshDriver.la \
../SMDS/libSMDS.la \
../SMESHDS/libSMESHDS.la \
${BOOST_LIB_SYSTEM} \
$(KERNEL_LDFLAGS) \
-lOpUtil \
-lSALOMELocalTrace \
@ -82,7 +80,5 @@ MED_Test_LDADD = \
$(MED_LDFLAGS) \
-lMEDWrapper \
-lMEDWrapperBase \
-lMEDWrapper_V2_2 \
-lMEDWrapper_V2_1 \
-lMEDWrapper_V2_2
$(BOOST_LIB_SYSTEM)

5
src/SMESHClient/Makefile.am
View File

@ -15,14 +15,13 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client
# File : Makefile.in
# Author : Pavel TELKOV (OCC)
# Modified by : Alexander BORODIN (OCN) - autotools usage
# Module : SHESM
#
include $(top_srcdir)/adm_local/unix/make_common_starter.am
# header files
@ -70,7 +69,7 @@ libSMESHClient_la_LDFLAGS = \
$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics \
-lSalomeIDLKernel -lSALOMELocalTrace \
$(GEOM_LDFLAGS) -lNMTDS -lSalomeIDLGEOM \
$(MED_LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lSalomeIDLMED -lMEDWrapper \
$(MED_LDFLAGS) -lMEDWrapper_V2_2 -lSalomeIDLMED -lMEDWrapper \
$(CAS_KERNEL)
SMESHClientBin_CPPFLAGS = \