From 834b58597d698041866a14b198817497432b7057 Mon Sep 17 00:00:00 2001 From: eap Date: Mon, 19 Mar 2012 12:32:35 +0000 Subject: [PATCH] 0021308: Remove hard-coded dependency of the external mesh plugins from the SMESH module adjust _pyHypothesisReader() for HexoticPLUGIN_ROOT_DIR but not HEXOTICPLUGIN_ROOT_DIR --- src/SMESH_I/SMESH_2smeshpy.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx index 1b85abc80..6e7d8452f 100644 --- a/src/SMESH_I/SMESH_2smeshpy.cxx +++ b/src/SMESH_I/SMESH_2smeshpy.cxx @@ -3783,7 +3783,12 @@ _pyHypothesisReader::_pyHypothesisReader() rootDirVar += "_ROOT_DIR"; const char* rootDir = getenv( rootDirVar.c_str() ); - if ( !rootDir || strlen(rootDir) == 0 ) continue; + if ( !rootDir || strlen(rootDir) == 0 ) + { + rootDirVar = plugin + "_ROOT_DIR"; // HexoticPLUGIN_ROOT_DIR + rootDir = getenv( rootDirVar.c_str() ); + if ( !rootDir || strlen(rootDir) == 0 ) continue; + } // get a separator from rootDir for ( pos = strlen( rootDir )-1; pos >= 0 && sep.empty(); --pos )