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 b068b5d0172732530d57f963220d36caede67db0..a19af3bbe2db95cc261d31d37f43cd8c407b4b86 100644 (file)
--- 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 082c3f806f24f886d0f8da8781f3f03873bc494e..dd07385de8460938bd8fae5a63e3e46ff8a38a7b 100644 (file)
--- 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 e717621a890285efe34af657defd96bd2aed8260..92db8fafcf34bf9c03dcd45f4ac1650e9b85eb8d 100644 (file)
--- 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 7cd28d75913e42ff1b951ccde2788e8e2ac82488..c9942e0165b0a551a5150da8066bda1df18bd790 100755 (executable)
--- 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