ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-11 16:19:16 +05:00
Code Issues Packages Projects Releases Wiki Activity

bos #18641 [CEA 18636][Windows] SMESH_MeshersList environment variable separator

Browse Source
This commit is contained in:
rnv 2020-01-24 14:04:11 +03:00 committed by vsr
parent 0c8b79a917
commit e374376aa6
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/smesh_setenv.py
View File

@ -77,5 +77,5 @@ def set_env(args):
pass pass
pass pass
break break
os.environ["SMESH_MeshersList"] = ":".join(plugin_list) os.environ["SMESH_MeshersList"] = os.pathsep.join(plugin_list)
os.environ["SalomeAppConfig"] = os.environ["SalomeAppConfig"] + psep + psep.join(resource_path_list) os.environ["SalomeAppConfig"] = os.environ["SalomeAppConfig"] + psep + psep.join(resource_path_list)

9
src/SMESH/SMESH_Gen.cxx
View File

@ -56,6 +56,13 @@
using namespace std; using namespace std;
// Environment variable separator
#ifdef WIN32
#define env_sep ';'
#else
#define env_sep ':'
#endif
//============================================================================= //=============================================================================
/*! /*!
* Constructor * Constructor
@ -984,7 +991,7 @@ std::vector< std::string > SMESH_Gen::GetPluginXMLPaths()
while ( from < meshers.size() ) while ( from < meshers.size() )
{ {
// cut off plugin name // cut off plugin name
pos = meshers.find( ':', from ); pos = meshers.find( env_sep, from );
if ( pos != string::npos ) if ( pos != string::npos )
plugin = meshers.substr( from, pos-from ); plugin = meshers.substr( from, pos-from );
else else

4
src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
View File

@ -67,6 +67,7 @@
#define LoadLib( name ) LoadLibrary( name ) #define LoadLib( name ) LoadLibrary( name )
#define GetProc GetProcAddress #define GetProc GetProcAddress
#define UnLoadLib( handle ) FreeLibrary( handle ); #define UnLoadLib( handle ) FreeLibrary( handle );
#define env_sep ";"
#else // WIN32 #else // WIN32
#define LibHandle void* #define LibHandle void*
#ifdef DYNLOAD_LOCAL #ifdef DYNLOAD_LOCAL
@ -76,6 +77,7 @@
#endif // DYNLOAD_LOCAL #endif // DYNLOAD_LOCAL
#define GetProc dlsym #define GetProc dlsym
#define UnLoadLib( handle ) dlclose( handle ); #define UnLoadLib( handle ) dlclose( handle );
#define env_sep ":"
#endif // WIN32 #endif // WIN32
#ifdef _DEBUG_ #ifdef _DEBUG_
@ -197,7 +199,7 @@ namespace SMESH
if (cenv) if (cenv)
HypsXml.sprintf("%s", cenv); HypsXml.sprintf("%s", cenv);
QStringList HypsXmlList = HypsXml.split(":", QString::SkipEmptyParts); QStringList HypsXmlList = HypsXml.split(env_sep, QString::SkipEmptyParts);
if (HypsXmlList.count() == 0) { if (HypsXmlList.count() == 0) {
SUIT_MessageBox::critical(SMESHGUI::desktop(), SUIT_MessageBox::critical(SMESHGUI::desktop(),
QObject::tr("SMESH_WRN_WARNING"), QObject::tr("SMESH_WRN_WARNING"),

2
src/SMESH_SWIG/smeshBuilder.py
View File

@ -7628,7 +7628,7 @@ class genObjUnRegister:
if genObj and hasattr( genObj, "UnRegister" ): if genObj and hasattr( genObj, "UnRegister" ):
genObj.UnRegister() genObj.UnRegister()
for pluginName in os.environ[ "SMESH_MeshersList" ].split( ":" ): for pluginName in os.environ[ "SMESH_MeshersList" ].split( os.pathsep ):
""" """
Bind methods creating mesher plug-ins to the Mesh class Bind methods creating mesher plug-ins to the Mesh class
""" """