gdal - Paraview dependency

diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index 030a3e8217c73ef4cf1a51c7b2a353c97fbd9311..7e76811d96926bcb6518690f59b0b47099b31660 100755 (executable)
--- 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 b28761510f2425ee74b8ed714588ee794c8189d8..4864bf111d23e8f939e10d4f10e53e9d176a7fe5 100644 (file)
--- 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