bos #26944 : gdal patch - otherwise GUI won't compile...

diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index 7e76811d96926bcb6518690f59b0b47099b31660..081700c9920b3dfa26e230fbabe3b496de7976a3 100755 (executable)
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -240,7 +240,8 @@ version_5_9_0_MPI :
                'paraview.0017-VTK-openMPI-if-devtoolset.patch',
                'paraview.0018-spns-26351-autoconvert.patch',
                'paraview.0019-spns-26344-VTK-OpenMP.patch',
-               'paraview.0020.findMPI.patch'
+               'paraview.0020.findMPI.patch',
+               'paraview.0021-FindGDAL.patch'
               ]
 }
 

diff --git a/products/env_scripts/gdal.py b/products/env_scripts/gdal.py
index 4864bf111d23e8f939e10d4f10e53e9d176a7fe5..a62c1e8bfdfcbe37c8e7b885e2f4aea75cbce622 100644 (file)
--- a/products/env_scripts/gdal.py
+++ b/products/env_scripts/gdal.py
@@ -5,10 +5,10 @@ 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_ROOT', prereq_dir)
+    env.set('GDAL_DIR', prereq_dir)
     env.set('GDAL_VERSION',version)
     env.set('GDAL_DATA', os.path.join(prereq_dir, 'share', 'gdal'))
-    env.set('GDAL_ROOT', os.path.join(prereq_dir, 'root'))
-
     env.prepend('PATH', os.path.join(prereq_dir,'bin'))
     env.prepend('LD_LIBRARY_PATH',os.path.join(prereq_dir, 'lib'))
     env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages'))

diff --git a/products/patches/paraview.0021-FindGDAL.patch b/products/patches/paraview.0021-FindGDAL.patch
new file mode 100644 (file)
index 0000000..5e9b062
--- /dev/null
+++ b/products/patches/paraview.0021-FindGDAL.patch
@@ -0,0 +1,13 @@
+--- ParaView-5.9.0-ref/VTK/CMake/patches/99/FindGDAL.cmake     2021-02-04 15:22:02.000000000 +0100
++++ ParaView-5.9.0-new/VTK/CMake/patches/99/FindGDAL.cmake     2022-03-08 12:58:13.514095102 +0100
+@@ -60,6 +60,10 @@
+ #
+ #include "gdal.h"
+ 
++SET(GDAL_ROOT_DIR $ENV{GDAL_ROOT_DIR} CACHE PATH "Path to the GDAL.")
++IF(GDAL_ROOT_DIR)
++ LIST(APPEND CMAKE_PREFIX_PATH "${GDAL_ROOT_DIR}")
++ENDIF(GDAL_ROOT_DIR)
+ find_path(GDAL_INCLUDE_DIR gdal.h
+   HINTS
+     ${GDAL_ROOT}