From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Mon, 7 Mar 2022 10:14:56 +0000 (+0100)
Subject: revert to cgns 4.1.1 and help ParaView to find gdal
X-Git-Tag: V9_9_0~146
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=18bc5ccaefd4b32de6ec98b7d6575e18a4993f04;p=tools%2Fsat_salome.git

revert to cgns 4.1.1 and help ParaView to find gdal
---

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index b068b5d..a19af3b 100644
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -34,7 +34,7 @@ APPLICATION :
         CAS : 'V7_5_3p1'
         C3PO: 'v2.0'
         certifi : '2018.8.24'
-        cgns : {tag : '4.2.0', hpc : 'yes'}
+        cgns : {tag : '4.1.1', hpc : 'yes'}
         chardet : '3.0.4'
         click : '6.7'
         cmake : '3.12.1'
diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 082c3f8..dd07385 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -36,7 +36,7 @@ APPLICATION :
         certifi : 'native'
         # Standalone native cgns works well. Unfortunately, it's directly linked to native hdf which uses a higher version than us.
         # Rollback to embedded version to avoid versions mismatch between both of them (see imp_1538_cgns_export_import.py)
-        cgns : '4.2.0'
+        cgns : '4.1.1'
         chardet : 'native'
         click : 'native'
         cmake : 'native'
diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index e717621..92db8fa 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -34,7 +34,7 @@ APPLICATION :
         CAS : 'V7_5_3p1'
         C3PO: 'v2.0'
         certifi : '2018.8.24'
-        cgns : '4.2.0'
+        cgns : '4.1.1'
         chardet : '3.0.4'
         click : '6.7'
         cmake : '3.12.1'
diff --git a/products/compil_scripts/ParaView-5.9.0.sh b/products/compil_scripts/ParaView-5.9.0.sh
index 7cd28d7..c9942e0 100755
--- a/products/compil_scripts/ParaView-5.9.0.sh
+++ b/products/compil_scripts/ParaView-5.9.0.sh
@@ -239,6 +239,8 @@ if [ -n "$GDAL_ROOT_DIR" ]; then
     CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_GDAL=ON"
     if [ "$GDAL_ROOT_DIR" != "/usr" ]; then
         CMAKE_OPTIONS+=" -DGDAL_ROOT_DIR=$GDAL_ROOT_DIR"
+	CMAKE_OPTIONS+=" -DGDAL_LIBRARY=$GDAL_ROOT_DIR/lib/libgdal.so"
+	CMAKE_OPTIONS+=" -DGDAL_INCLUDE_DIR=$GDAL_ROOT_DIR/include"
     fi
 fi