ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-09-22 18:52:52 +05:00
Code Issues Packages Projects Releases Wiki Activity

Process plugin libraries names correctly on Windows and Linux

Browse Source
This commit is contained in:
vsr 2013-11-11 08:43:20 +00:00
parent 68da331797
commit 7555ded134
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
resources/ImportExport
View File

@ -1,31 +1,31 @@
Import: BREP|IGES|STEP|ACIS Import: BREP|IGES|STEP|ACIS
Export: BREP|IGES|IGES_5_3|STEP|STL_Bin|STL_ASCII|ACIS|VTK Export: BREP|IGES|IGES_5_3|STEP|STL_Bin|STL_ASCII|ACIS|VTK
BREP.Import: libBREPImport BREP.Import: BREPImport
BREP.Export: libBREPExport BREP.Export: BREPExport
BREP.Pattern: BREP Files ( *.brep ) BREP.Pattern: BREP Files ( *.brep )
IGES.Import: libIGESImport IGES.Import: IGESImport
IGES.Export: libIGESExport IGES.Export: IGESExport
IGES.Pattern: IGES Files ( *.iges *.igs ) IGES.Pattern: IGES Files ( *.iges *.igs )
IGES.ExportPattern: IGES 5.1 Files ( *.iges *.igs ) IGES.ExportPattern: IGES 5.1 Files ( *.iges *.igs )
IGES_5_3.Export: libIGESExport IGES_5_3.Export: IGESExport
IGES_5_3.Pattern: IGES 5.3 Files ( *.iges *.igs ) IGES_5_3.Pattern: IGES 5.3 Files ( *.iges *.igs )
STEP.Import: libSTEPImport STEP.Import: STEPImport
STEP.Export: libSTEPExport STEP.Export: STEPExport
STEP.Pattern: STEP Files ( *.step *.stp ) STEP.Pattern: STEP Files ( *.step *.stp )
STL_Bin.Export: libSTLExport STL_Bin.Export: STLExport
STL_Bin.Pattern: STL Binary Files ( *.stl ) STL_Bin.Pattern: STL Binary Files ( *.stl )
STL_ASCII.Export: libSTLExport STL_ASCII.Export: STLExport
STL_ASCII.Pattern: STL ASCII Files ( *.stl ) STL_ASCII.Pattern: STL ASCII Files ( *.stl )
ACIS.Import: libACISImport ACIS.Import: ACISImport
ACIS.Export: libACISExport ACIS.Export: ACISExport
ACIS.Pattern: ACIS Files ( *.sat ) ACIS.Pattern: ACIS Files ( *.sat )
VTK.Export: libVTKExport VTK.Export: VTKExport
VTK.Pattern: VTK Files ( *.vtk ) VTK.Pattern: VTK Files ( *.vtk )

11
src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
View File

@ -515,7 +515,9 @@ Standard_Boolean GEOMImpl_IInsertOperations::IsSupported
if (myResMgr->Find(aKey.ToCString())) { if (myResMgr->Find(aKey.ToCString())) {
TCollection_AsciiString aLibName (myResMgr->Value(aKey.ToCString())); TCollection_AsciiString aLibName (myResMgr->Value(aKey.ToCString()));
#ifndef WIN32 #ifndef WIN32
aLibName += ".so"; if ( aLibName.Length() > 3 && aLibName.SubString(1,3) != "lib" )
aLibName.Prepend("lib");
aLibName += ".so";
#else #else
aLibName += ".dll"; aLibName += ".dll";
#endif #endif
@ -535,6 +537,13 @@ Standard_Boolean GEOMImpl_IInsertOperations::IsSupported
aKey += aMode; aKey += aMode;
if (myResMgrUser->Find(aKey.ToCString())) { if (myResMgrUser->Find(aKey.ToCString())) {
TCollection_AsciiString aLibName (myResMgrUser->Value(aKey.ToCString())); TCollection_AsciiString aLibName (myResMgrUser->Value(aKey.ToCString()));
#ifndef WIN32
if ( aLibName.Length() > 3 && aLibName.SubString(1,3) != "lib" )
aLibName.Prepend("lib");
aLibName += ".so";
#else
aLibName += ".dll";
#endif
theLibName = new TCollection_HAsciiString (aLibName); theLibName = new TCollection_HAsciiString (aLibName);
return Standard_True; return Standard_True;
} }