From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Fri, 4 Mar 2022 16:53:40 +0000 (+0100)
Subject: gdal - Paraview dependency
X-Git-Tag: V9_9_0~147
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=183672c0a6c6ad552dfb39b6eeffef0e2fb25161;p=tools%2Fsat_salome.git

gdal - Paraview dependency
---

diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index 030a3e8..7e76811 100755
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -19,7 +19,7 @@ default :
               'cgns',
               'Pygments'
               ]
-    opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'rkCommon']
+    opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'rkCommon', 'gdal']
     build_depend : ["cmake"]
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
diff --git a/products/env_scripts/gdal.py b/products/env_scripts/gdal.py
index b287615..4864bf1 100644
--- a/products/env_scripts/gdal.py
+++ b/products/env_scripts/gdal.py
@@ -3,7 +3,6 @@ import os.path
 
 def set_env(env, prereq_dir, version):
     pyver = 'python' + env.get('PYTHON_VERSION')
-
     env.set('GDAL_ROOT_DIR', prereq_dir)
     env.set('GDALHOME', prereq_dir)
     env.set('GDAL_VERSION',version)
@@ -15,4 +14,5 @@ def set_env(env, prereq_dir, version):
     env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages'))
 
 def set_nativ_env(env):
+    env.set('GDAL_ROOT_DIR','/usr')
     pass