From: vsr <vsr@opencascade.com>
Date: Mon, 11 Nov 2013 08:43:20 +0000 (+0000)
Subject: Process plugin libraries names correctly on Windows and Linux
X-Git-Tag: BR_hydro_v_0_3_1~34
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7555ded13403b8df2792d7d4d21b5aed6cf545b8;p=modules%2Fgeom.git

Process plugin libraries names correctly on Windows and Linux
---

diff --git a/resources/ImportExport b/resources/ImportExport
index f338de457..950ccd136 100644
--- a/resources/ImportExport
+++ b/resources/ImportExport
@@ -1,31 +1,31 @@
 Import: BREP|IGES|STEP|ACIS
 Export: BREP|IGES|IGES_5_3|STEP|STL_Bin|STL_ASCII|ACIS|VTK
 
-BREP.Import: libBREPImport
-BREP.Export: libBREPExport
+BREP.Import: BREPImport
+BREP.Export: BREPExport
 BREP.Pattern: BREP Files ( *.brep )
 
-IGES.Import: libIGESImport
-IGES.Export: libIGESExport
+IGES.Import: IGESImport
+IGES.Export: IGESExport
 IGES.Pattern: IGES 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 )
 
-STEP.Import: libSTEPImport
-STEP.Export: libSTEPExport
+STEP.Import: STEPImport
+STEP.Export: STEPExport
 STEP.Pattern: STEP Files ( *.step *.stp )
 
-STL_Bin.Export: libSTLExport
+STL_Bin.Export: STLExport
 STL_Bin.Pattern: STL Binary Files ( *.stl )
 
-STL_ASCII.Export: libSTLExport
+STL_ASCII.Export: STLExport
 STL_ASCII.Pattern: STL ASCII Files ( *.stl )
 
-ACIS.Import: libACISImport
-ACIS.Export: libACISExport
+ACIS.Import: ACISImport
+ACIS.Export: ACISExport
 ACIS.Pattern: ACIS Files ( *.sat )
 
-VTK.Export: libVTKExport
+VTK.Export: VTKExport
 VTK.Pattern: VTK Files ( *.vtk )
diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
index 0e2ad239f..37e7fea8a 100644
--- a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
@@ -515,7 +515,9 @@ Standard_Boolean GEOMImpl_IInsertOperations::IsSupported
       if (myResMgr->Find(aKey.ToCString())) {
         TCollection_AsciiString aLibName (myResMgr->Value(aKey.ToCString()));        
 #ifndef WIN32
-        aLibName += ".so";     
+	if ( aLibName.Length() > 3 && aLibName.SubString(1,3) != "lib" )
+	  aLibName.Prepend("lib");
+        aLibName += ".so";
 #else
         aLibName += ".dll";
 #endif
@@ -535,6 +537,13 @@ Standard_Boolean GEOMImpl_IInsertOperations::IsSupported
       aKey += aMode;
       if (myResMgrUser->Find(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);
         return Standard_True;
       }