bos #26398: cgns 4.2.0

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index a19af3bbe2db95cc261d31d37f43cd8c407b4b86..b068b5d0172732530d57f963220d36caede67db0 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.1.1', hpc : 'yes'}
+        cgns : {tag : '4.2.0', 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 dd07385de8460938bd8fae5a63e3e46ff8a38a7b..082c3f806f24f886d0f8da8781f3f03873bc494e 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.1.1'
+        cgns : '4.2.0'
         chardet : 'native'
         click : 'native'
         cmake : 'native'

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index a1ee13db5f8ef398ec8b5d74867a36c40d5bca25..5af5c55f4344756926488c3bc8d279d0c011b4bb 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -38,7 +38,7 @@ APPLICATION :
         boost : '1.67.0'
         CAS : {tag: 'V7_5_3p1', section: 'version_V7_5_3p1_win'}
         certifi : '2019.6.16'
-        cgns : '4.1.1'
+        cgns : '4.2.0'
         chardet : '3.0.4'
         click : '7.0'
         cmake : '3.12.1'

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 92db8fafcf34bf9c03dcd45f4ac1650e9b85eb8d..e717621a890285efe34af657defd96bd2aed8260 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.1.1'
+        cgns : '4.2.0'
         chardet : '3.0.4'
         click : '6.7'
         cmake : '3.12.1'

diff --git a/products/compil_scripts/cgns.bat b/products/compil_scripts/cgns.bat
index 0cdb99c387173d2a4ccacf5d9bcc6a1e76543372..d7994cb79789b95dec4d34e2914f6eec9897fc23 100755 (executable)
--- a/products/compil_scripts/cgns.bat
+++ b/products/compil_scripts/cgns.bat
@@ -32,6 +32,11 @@ if DEFINED SAT_HPC (
 ) else (
        SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_USE_MPI:BOOL=OFF
 )
+REM bos #26398
+if "%VERSION%" == "4.2.0" (
+    SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGNS_ENABLE_64BIT:BOOL=OFF
+)
+
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"
 
 

diff --git a/products/compil_scripts/cgns.sh b/products/compil_scripts/cgns.sh
index 4dd814f5ae9a6a0f492e068a94aac7880e371826..262b9f6e6726546a65dea88c9d143d0e716fc599 100755 (executable)
--- a/products/compil_scripts/cgns.sh
+++ b/products/compil_scripts/cgns.sh
@@ -34,6 +34,11 @@ then
     fi
 fi
 
+# bos #26398
+if [ $VERSION == "4.2.0" ]; then
+    echo "WARNING: switching OFF 64 bits support!"
+    CMAKE_OPTIONS+=" -DCGNS_ENABLE_64BIT:BOOL=OFF"
+fi
 echo
 echo "*** cmake" $CMAKE_OPTIONS
 cmake $CMAKE_OPTIONS $SOURCE_DIR