bos #41189 - ensure we target correct cmake version until CMP0078 is fixed

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 13204ab845376081fee7af47b4ee1f7bb5fc00a9..3ed06eaf608b542e5a3ff79692d2664d30c2f9b8 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -234,7 +234,7 @@ __overwrite__ :
   }
   {
     __condition__ : "APPLICATION.debug == 'yes' and APPLICATION.pyver == '3.9'"
-    'APPLICATION.rm_products' : ['matplotlib', 'openturns', 'scipy', 'Pillow', 'PERSALYS', 'OPENTURNS_SALOME', 'cminpack', 'openblas', 'FMILibrary', 'PyFMI', 'fftw', 'statsmodels', 'YDEFX']
+    'APPLICATION.rm_products' : ['matplotlib', 'openturns', 'scipy', 'Pillow', 'PERSALYS', 'OPENTURNS_SALOME', 'cminpack', 'openblas', 'FMILibrary', 'PyFMI', 'fftw', 'statsmodels', 'YDEFX', 'pandas']
     'APPLICATION.products.numpy'      : {tag: '1.21.6',  base: 'no', section : 'version_1_21_6_win_dbg'     }
     'APPLICATION.products.Cython'     : {tag: '0.29.37', base: 'no', section : 'version_0_29_37_win_dbg'    }
     'APPLICATION.products.sphinxintl' : {tag: '2.0.0',   base: 'no', section : 'version_2_0_0_win_dbg'      }
@@ -245,15 +245,14 @@ __overwrite__ :
     'APPLICATION.products.ParaView'   : {tag: '5.11.0',  base: 'no', section : 'version_5_11_0_win_dbg'     }
     'APPLICATION.products.zlib'       : {tag: '1.2.5',   base: 'no', section : 'version_1_2_5_win_dbg'      }
     'APPLICATION.products.gmsh'       : {tag: '4.10.3',  base: 'no', section : 'version_4_10_3_win_dbg'     }
-    'APPLICATION.products.cmake'      : '3.0.12' # until CMP0078 and - cmake 3.24 fixed shows a serious issue about import which needs to be addressed
+    'APPLICATION.products.cmake'      : '3.12.1' # until CMP0078 and - cmake 3.24 fixed shows a serious issue about import which needs to be addressed
   }
   {
     __condition__ : "APPLICATION.debug == 'yes' and APPLICATION.pyver == '3.6'"
-    'APPLICATION.rm_products' : ['matplotlib', 'openturns', 'scipy', 'Pillow', 'PERSALYS', 'OPENTURNS_SALOME', 'cminpack', 'openblas', 'FMILibrary', 'PyFMI', 'fftw', 'statsmodels', 'YDEFX']
+    'APPLICATION.rm_products' : ['matplotlib', 'openturns', 'scipy', 'Pillow', 'PERSALYS', 'OPENTURNS_SALOME', 'cminpack', 'openblas', 'FMILibrary', 'PyFMI', 'fftw', 'statsmodels', 'YDEFX', 'pandas']
     'APPLICATION.products.alabaster' : '0.7.6'
     'APPLICATION.products.dateutil'  : '2.8.0'
     'APPLICATION.products.kiwisolver' : '1.1.0'
-    'APPLICATION.products.pandas' : '0.25.2'
     'APPLICATION.products.pyreadline' : '2.1'
     'APPLICATION.products.Python' : '3.6.5'
     'APPLICATION.products.pytz' : '2019.1'
@@ -273,6 +272,7 @@ __overwrite__ :
     'APPLICATION.products.ParaView'   : {tag: '5.11.0',  base: 'no', section : 'version_5_11_0_win_dbg'     }
     'APPLICATION.products.zlib'       : {tag: '1.2.5',   base: 'no', section : 'version_1_2_5_win_dbg'      }
     'APPLICATION.products.gmsh'       : {tag: '4.10.3',  base: 'no', section : 'version_4_10_3_win_dbg'     }
-    'APPLICATION.products.cmake'      : '3.0.12' # until CMP0078 and - cmake 3.24 fixed shows a serious issue about import which needs to be addressed
+    'APPLICATION.products.swig'       : '3.0.12'
+    'APPLICATION.products.cmake'      : '3.12.1' # until CMP0078 and - cmake 3.24 fixed shows a serious issue about import which needs to be addressed
   }
 ]

diff --git a/products/compil_scripts/openturns-1.21.bat b/products/compil_scripts/openturns-1.21.bat
index b37380c99c98d0bf7207f29f8bde18a2734bf9b7..fa6bcda9c23a1f9265556f05f26177cf9cb6220b 100644 (file)
--- a/products/compil_scripts/openturns-1.21.bat
+++ b/products/compil_scripts/openturns-1.21.bat
@@ -19,9 +19,6 @@ if %SAT_DEBUG% == 1 (
 )
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
-REM clean BUILD directory
-if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
-mkdir %BUILD_DIR%
 
 REM clean BUILD directory
 if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%