From: Bernard Sécherà <bernard.secher@cea.fr>
Date: Fri, 2 Oct 2020 13:36:18 +0000 (+0200)
Subject: update
X-Git-Tag: V9_6_0~15^2~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a0ecc2a2c52f3b185fbb2f2c655e59f6e6cfe51c;p=tools%2Fsat_salome.git

update
---

diff --git a/products/compil_scripts/SOLVERLAB.sh b/products/compil_scripts/SOLVERLAB.sh
index 2d4d980..cd71b33 100755
--- a/products/compil_scripts/SOLVERLAB.sh
+++ b/products/compil_scripts/SOLVERLAB.sh
@@ -5,6 +5,8 @@ echo "SOLVERLAB" $VERSION
 echo "##########################################################################"
 
 
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_ROOT_DIR=${PYTHON_ROOT_DIR}"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DMATPLOTLIB_ROOT_DIR=${MATPLOTLIB_ROOT_DIR}"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DDOXYGEN_EXECUTABLE=${DOXYGEN_ROOT_DIR}/bin/doxygen"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCPPUNIT_ROOT_USER=${CPPUNIT_ROOT_DIR}"
diff --git a/products/env_scripts/SOLVERLAB.py b/products/env_scripts/SOLVERLAB.py
index caf817a..54d2840 100644
--- a/products/env_scripts/SOLVERLAB.py
+++ b/products/env_scripts/SOLVERLAB.py
@@ -15,8 +15,8 @@ def set_env(env, product_dir, version):
     env.set('CoreFlows_PYTHON', 'ON')
     env.set('CoreFlows_DOC', 'ON')
     env.set('CoreFlows_GUI', 'ON')
-    env.set('CoreFlows', os.path.join(install_rep,'bin','Executable','CoreFlowsMainExe'))
-    env.set('CoreFlowsGUI', os.path.join(install_rep,'bin','salome','CoreFlows_Standalone.py'))
+    env.set('CoreFlows', os.path.join(install_rep,'bin','CoreFlowsMainExe'))
+    env.set('CoreFlowsGUI', os.path.join(install_rep,'bin','CoreFlows_Standalone.py'))
     env.set('COREFLOWS_ROOT_DIR', root_module_rep)
 
     root = env.get('CoreFlows_ROOT_DIR')
@@ -24,9 +24,11 @@ def set_env(env, product_dir, version):
     env.prepend('PATH', os.path.join(root, 'include'))
     env.prepend('LD_LIBRARY_PATH', os.path.join(root, 'lib'))
     env.prepend('PYTHONPATH', os.path.join(root, 'lib'))
-    env.prepend('PYTHONPATH', os.path.join(root, 'lib', 'CoreFlows_Python'))
-    env.prepend('PYTHONPATH', os.path.join(root, 'bin', 'CoreFlows_Python'))
-    env.prepend('PYTHONPATH', os.path.join(root, 'lib','python2.7','site-packages','salome'))
+    env.prepend('PYTHONPATH', os.path.join(root, 'lib', 'coreflows'))
+    env.prepend('PYTHONPATH', os.path.join(root, 'bin', 'coreflows'))
+    env.prepend('PYTHONPATH', os.path.join(root, 'lib', 'cdmath'))
+    env.prepend('PYTHONPATH', os.path.join(root, 'bin', 'cdmath'))
+    env.prepend('PYTHONPATH', os.path.join(root, 'bin', 'cdmath','postprocessing'))
  
 def set_nativ_env(env):
     pass