From 183672c0a6c6ad552dfb39b6eeffef0e2fb25161 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 4 Mar 2022 17:53:40 +0100 Subject: [PATCH] gdal - Paraview dependency --- products/ParaView.pyconf | 2 +- products/env_scripts/gdal.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 -- 2.39.2