C3PO: requires mpi4py

[tools/sat_salome.git] / products / env_scripts / ParaView.py

diff --git a/products/env_scripts/ParaView.py b/products/env_scripts/ParaView.py
index b8554c2f68fef416c97206f8b0e9c95b1b993d91..c72e3f9354eaeab6e3e21213e0084cd246734db1 100644 (file)
--- a/products/env_scripts/ParaView.py
+++ b/products/env_scripts/ParaView.py
@@ -42,13 +42,12 @@ def set_paraview_env(env, version):
     env.prepend('PATH', os.path.join(root, 'bin'))
     
     if platform.system() == "Windows" :
-        paralib = os.path.join(root, 'lib', 'paraview-' + version)
-        env.prepend('PATH', paralib)
-        env.prepend('PV_PLUGIN_PATH', paralib)
-        env.prepend('PYTHONPATH', os.path.join(root,'bin', 'Lib', 'site-packages'))
-        env.prepend('PYTHONPATH', os.path.join(root,'bin', 'Lib', 'site-packages'))
+        parabin = os.path.join(root, 'bin', 'paraview-' + version)
+        env.prepend('PATH', parabin)
+        env.prepend('PV_PLUGIN_PATH', parabin)
         env.prepend('PYTHONPATH', os.path.join(root,'bin', 'Lib', 'site-packages', 'paraview'))
         env.prepend('PYTHONPATH', os.path.join(root,'bin', 'Lib', 'site-packages', 'vtk'))
+        env.prepend('PYTHONPATH', os.path.join(root,'bin', 'Lib', 'site-packages'))
     else:
         paralib = os.path.join(root, lib_dir, 'paraview-' + version)
         env.prepend('PV_PLUGIN_PATH', paralib)
@@ -67,9 +66,6 @@ def set_vtk_env(env, version):
 
     env.set('VTK_ROOT_DIR', root)
     env.set('VTK_DIR', os.path.join(root, lib_dir, 'cmake', 'paraview-' + version))
-    # OP TEST
-    env.prepend('VTK_ROOT_DIR', os.path.join(root, lib_dir, 'cmake', 'paraview-' + version))
-    #env.prepend('VTK_ROOT_DIR', os.path.join(root, lib_dir, 'paraview-' + version))
     
     if not platform.system() == "Windows" :
         #http://computer-programming-forum.com/57-tcl/1dfddc136afccb94.htm