From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Mon, 29 Apr 2024 15:38:52 +0000 (+0200)
Subject: spns #41486 -  normalise CMAKE_GENERATOR
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e89ca80bfe44059223af8584d3bbc311720fae1d;p=tools%2Fsat_salome.git

spns #41486 -  normalise CMAKE_GENERATOR
---

diff --git a/applications/MEDCOUPLING-9.10.0-windows.pyconf b/applications/MEDCOUPLING-9.10.0-windows.pyconf
index ce321ee..067ef9c 100644
--- a/applications/MEDCOUPLING-9.10.0-windows.pyconf
+++ b/applications/MEDCOUPLING-9.10.0-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'MEDCOUPLING-9.10.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'V9_10_0'
     debug : 'no'
     base : 'no'
@@ -17,7 +17,7 @@ APPLICATION :
             CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
             SALOME_HAS_GLOBAL_ENV: "1"
             SALOME_USE_64BIT_IDS : '1'
-            CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts...
+            CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts...
         }
         launch :
         {
diff --git a/applications/MEDCOUPLING-9.11.0-windows.pyconf b/applications/MEDCOUPLING-9.11.0-windows.pyconf
index 5052b8e..b54c135 100644
--- a/applications/MEDCOUPLING-9.11.0-windows.pyconf
+++ b/applications/MEDCOUPLING-9.11.0-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'MEDCOUPLING-9.11.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'V9_11_0'
     debug : 'no'
     base : 'no'
@@ -17,7 +17,7 @@ APPLICATION :
             CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
             SALOME_HAS_GLOBAL_ENV: "1"
             SALOME_USE_64BIT_IDS : '1'
-            CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts...
+            CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts...
         }
         launch :
         {
diff --git a/applications/MEDCOUPLING-9.12.0-windows.pyconf b/applications/MEDCOUPLING-9.12.0-windows.pyconf
index c20dca7..d1582e9 100644
--- a/applications/MEDCOUPLING-9.12.0-windows.pyconf
+++ b/applications/MEDCOUPLING-9.12.0-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'MEDCOUPLING-9.12.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'V9_12_0'
     debug : 'no'
     base : 'no'
@@ -17,7 +17,7 @@ APPLICATION :
             CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
             SALOME_HAS_GLOBAL_ENV: "1"
             SALOME_USE_64BIT_IDS : '1'
-            CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts...
+            CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts...
         }
         launch :
         {
diff --git a/applications/MEDCOUPLING-9.3.0-windows.pyconf b/applications/MEDCOUPLING-9.3.0-windows.pyconf
index f15baf9..a760a60 100644
--- a/applications/MEDCOUPLING-9.3.0-windows.pyconf
+++ b/applications/MEDCOUPLING-9.3.0-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'MEDCOUPLING-9.3.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'V9_3_0'
     debug : 'no'
     dev : 'no'
diff --git a/applications/MEDCOUPLING-9.4.0-windows.pyconf b/applications/MEDCOUPLING-9.4.0-windows.pyconf
index b502164..5be4bec 100644
--- a/applications/MEDCOUPLING-9.4.0-windows.pyconf
+++ b/applications/MEDCOUPLING-9.4.0-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'MEDCOUPLING-9.4.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'V9_4_0'
     debug : 'no'
     dev : 'no'
@@ -17,7 +17,7 @@ APPLICATION :
         {
             CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
             SALOME_HAS_GLOBAL_ENV: "1"
-            CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts...
+            CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts...
         }
         launch :
         {
diff --git a/applications/MEDCOUPLING-9.5.0-windows.pyconf b/applications/MEDCOUPLING-9.5.0-windows.pyconf
index b9cb7ce..b2fc2f6 100644
--- a/applications/MEDCOUPLING-9.5.0-windows.pyconf
+++ b/applications/MEDCOUPLING-9.5.0-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'MEDCOUPLING-9.5.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'V9_5_0'
     debug : 'no'
     dev : 'no'
@@ -17,7 +17,7 @@ APPLICATION :
         {
             CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
             SALOME_HAS_GLOBAL_ENV: "1"
-            CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts...
+            CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts...
         }
         launch :
         {
diff --git a/applications/MEDCOUPLING-9.6.0-windows.pyconf b/applications/MEDCOUPLING-9.6.0-windows.pyconf
index 530dac9..5f40d35 100644
--- a/applications/MEDCOUPLING-9.6.0-windows.pyconf
+++ b/applications/MEDCOUPLING-9.6.0-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'MEDCOUPLING-9.6.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'V9_6_0'
     debug : 'no'
     base : 'no'
@@ -17,7 +17,7 @@ APPLICATION :
           CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
           SALOME_HAS_GLOBAL_ENV: "1"
           SALOME_USE_64BIT_IDS : '1'
-          CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts...
+          CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts...
         }
         launch :
         {
diff --git a/applications/MEDCOUPLING-9.7.0-windows.pyconf b/applications/MEDCOUPLING-9.7.0-windows.pyconf
index 1406416..a89b305 100644
--- a/applications/MEDCOUPLING-9.7.0-windows.pyconf
+++ b/applications/MEDCOUPLING-9.7.0-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'MEDCOUPLING-9.7.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'V9_7_0'
     debug : 'no'
     base : 'no'
@@ -17,7 +17,7 @@ APPLICATION :
           CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
           SALOME_HAS_GLOBAL_ENV: "1"
           SALOME_USE_64BIT_IDS : '1'
-          CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts...
+          CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts...
         }
         launch :
         {
diff --git a/applications/MEDCOUPLING-9.8.0-windows.pyconf b/applications/MEDCOUPLING-9.8.0-windows.pyconf
index 4772892..0194590 100644
--- a/applications/MEDCOUPLING-9.8.0-windows.pyconf
+++ b/applications/MEDCOUPLING-9.8.0-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'MEDCOUPLING-9.8.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'V9_8_0'
     debug : 'no'
     base : 'no'
@@ -17,7 +17,7 @@ APPLICATION :
             CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
             SALOME_HAS_GLOBAL_ENV: "1"
             SALOME_USE_64BIT_IDS : '1'
-            CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts...
+            CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts...
         }
         launch :
         {
diff --git a/applications/MEDCOUPLING-9.9.0-windows.pyconf b/applications/MEDCOUPLING-9.9.0-windows.pyconf
index ff747fd..44ded94 100644
--- a/applications/MEDCOUPLING-9.9.0-windows.pyconf
+++ b/applications/MEDCOUPLING-9.9.0-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'MEDCOUPLING-9.9.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'V9_9_0'
     debug : 'no'
     base : 'no'
@@ -17,7 +17,7 @@ APPLICATION :
             CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
             SALOME_HAS_GLOBAL_ENV: "1"
             SALOME_USE_64BIT_IDS : '1'
-            CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts...
+            CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts...
         }
         launch :
         {
diff --git a/applications/MEDCOUPLING-master-windows.pyconf b/applications/MEDCOUPLING-master-windows.pyconf
index 2f9a414..c7dc7d8 100644
--- a/applications/MEDCOUPLING-master-windows.pyconf
+++ b/applications/MEDCOUPLING-master-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'MEDCOUPLING-master'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'master'
     debug : 'no'
     base : 'no'
@@ -17,7 +17,7 @@ APPLICATION :
             CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
             SALOME_HAS_GLOBAL_ENV: "1"
             SALOME_USE_64BIT_IDS : '1'
-            CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"' # strangely not exposed in scripts...
+            CMAKE_GENERATOR : '"Visual Studio 15 2017"' # strangely not exposed in scripts...
         }
         launch :
         {
diff --git a/applications/SALOME-9.10.0-windows.pyconf b/applications/SALOME-9.10.0-windows.pyconf
index 49084e5..164508b 100644
--- a/applications/SALOME-9.10.0-windows.pyconf
+++ b/applications/SALOME-9.10.0-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'SALOME-9.10.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'V9_10_0'
     dev : 'no'
     verbose : 'no'
@@ -21,7 +21,7 @@ APPLICATION :
             SALOME_HAS_GLOBAL_ENV : "1"
             SALOME_USE_64BIT_IDS : '1'
             SET_usr_docs_VARS : "1" # required for PyEditor build
-            CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"'
+            CMAKE_GENERATOR : '"Visual Studio 15 2017"'
         }
         launch :
         {
diff --git a/applications/SALOME-9.11.0-windows.pyconf b/applications/SALOME-9.11.0-windows.pyconf
index 6c60d6f..6561a6f 100644
--- a/applications/SALOME-9.11.0-windows.pyconf
+++ b/applications/SALOME-9.11.0-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'SALOME-9.11.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'V9_11_0'
     dev : 'no'
     verbose : 'no'
@@ -21,7 +21,7 @@ APPLICATION :
             SALOME_HAS_GLOBAL_ENV : "1"
             SALOME_USE_64BIT_IDS : '1'
             SET_usr_docs_VARS : "1" # required for PyEditor build
-            CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"'
+            CMAKE_GENERATOR : '"Visual Studio 15 2017"'
         }
         launch :
         {
diff --git a/applications/SALOME-9.12.0-windows.pyconf b/applications/SALOME-9.12.0-windows.pyconf
index 318b6b3..6806492 100644
--- a/applications/SALOME-9.12.0-windows.pyconf
+++ b/applications/SALOME-9.12.0-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'SALOME-9.12.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'V9_12_0'
     dev : 'no'
     verbose : 'no'
@@ -21,7 +21,7 @@ APPLICATION :
             SALOME_HAS_GLOBAL_ENV : "1"
             SALOME_USE_64BIT_IDS : '1'
             SET_usr_docs_VARS : "1" # required for PyEditor build
-            CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"'
+            CMAKE_GENERATOR : '"Visual Studio 15 2017"'
         }
         launch :
         {
diff --git a/applications/SALOME-9.4.0-windows.pyconf b/applications/SALOME-9.4.0-windows.pyconf
index 1b21006..85ef05f 100644
--- a/applications/SALOME-9.4.0-windows.pyconf
+++ b/applications/SALOME-9.4.0-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'SALOME-9.4.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'V9_4_0'
     debug : 'no'
     dev : 'no'
diff --git a/applications/SALOME-9.5.0-windows.pyconf b/applications/SALOME-9.5.0-windows.pyconf
index 148d68d..d93308e 100644
--- a/applications/SALOME-9.5.0-windows.pyconf
+++ b/applications/SALOME-9.5.0-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'SALOME-9.5.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'V9_5_0'
     dev : 'no'
     verbose :'no'
diff --git a/applications/SALOME-9.6.0-windows.pyconf b/applications/SALOME-9.6.0-windows.pyconf
index 6c15acf..c2c9a41 100644
--- a/applications/SALOME-9.6.0-windows.pyconf
+++ b/applications/SALOME-9.6.0-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'SALOME-9.6.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'V9_6_0'
     dev : 'no'
     verbose :'no'
@@ -21,7 +21,7 @@ APPLICATION :
            SALOME_HAS_GLOBAL_ENV : "1"
            SET_usr_docs_VARS : "1" # required for PyEditor build
            SALOME_USE_64BIT_IDS : "1"
-           CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"'
+           CMAKE_GENERATOR : '"Visual Studio 15 2017"'
         }
         launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
         SALOME_trace : "local" # local/file:.../with_logger
diff --git a/applications/SALOME-9.7.0-windows.pyconf b/applications/SALOME-9.7.0-windows.pyconf
index fe60685..dd6243a 100644
--- a/applications/SALOME-9.7.0-windows.pyconf
+++ b/applications/SALOME-9.7.0-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'SALOME-9.7.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'V9_7_0'
     dev : 'no'
     verbose :'no'
@@ -21,7 +21,7 @@ APPLICATION :
            SALOME_HAS_GLOBAL_ENV : "1"
            SALOME_USE_64BIT_IDS : '1'
            SET_usr_docs_VARS : "1" # required for PyEditor build
-           CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"'
+           CMAKE_GENERATOR : '"Visual Studio 15 2017"'
         }
         launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
         SALOME_trace : "local" # local/file:.../with_logger
diff --git a/applications/SALOME-9.8.0-windows.pyconf b/applications/SALOME-9.8.0-windows.pyconf
index 8e814d4..e5a8e0e 100644
--- a/applications/SALOME-9.8.0-windows.pyconf
+++ b/applications/SALOME-9.8.0-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'SALOME-9.8.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'V9_8_0'
     dev : 'no'
     verbose :'no'
@@ -21,7 +21,7 @@ APPLICATION :
             SALOME_HAS_GLOBAL_ENV : "1"
             SALOME_USE_64BIT_IDS : '1'
             SET_usr_docs_VARS : "1" # required for PyEditor build
-            CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"'
+            CMAKE_GENERATOR : '"Visual Studio 15 2017"'
         }
         launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
         SALOME_trace : "local" # local/file:.../with_logger
diff --git a/applications/SALOME-9.9.0-windows.pyconf b/applications/SALOME-9.9.0-windows.pyconf
index e5572ef..3e7d5c3 100644
--- a/applications/SALOME-9.9.0-windows.pyconf
+++ b/applications/SALOME-9.9.0-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'SALOME-9.9.0'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'V9_9_0'
     dev : 'no'
     verbose : 'no'
@@ -21,7 +21,7 @@ APPLICATION :
             SALOME_HAS_GLOBAL_ENV : "1"
             SALOME_USE_64BIT_IDS : '1'
             SET_usr_docs_VARS : "1" # required for PyEditor build
-            CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"'
+            CMAKE_GENERATOR : '"Visual Studio 15 2017"'
         }
         launch :
         {
diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 64bfd01..b8e4ee2 100644
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'SALOME-master'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name
-    cmake_generator : 'Visual Studio 15 2017 Win64'
+    cmake_generator : 'Visual Studio 15 2017'
     tag : 'master'
     dev : 'no'
     verbose : 'no'
@@ -22,7 +22,7 @@ APPLICATION :
             SALOME_HAS_GLOBAL_ENV : "1"
             SALOME_USE_64BIT_IDS : '1'
             SET_usr_docs_VARS : "1" # required for PyEditor build
-            CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"'
+            CMAKE_GENERATOR : '"Visual Studio 15 2017"'
         }
         launch :
         {
diff --git a/products/compil_scripts/ADAO.bat b/products/compil_scripts/ADAO.bat
index 729af33..7e9857d 100644
--- a/products/compil_scripts/ADAO.bat
+++ b/products/compil_scripts/ADAO.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=release
@@ -38,7 +38,8 @@ set CMAKE_OPTIONS=
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=Release
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_EXECUTABLE=%PYTHONBIN:\=/%
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A x64
 
 set MSBUILDDISABLENODEREUSE=1
 
@@ -91,7 +92,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_EXECUTABLE=%PYTHONBIN:\=/%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DKERNEL_ROOT_DIR=%KERNEL_ROOT_DIR:\=/%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DADAO_PYTHON_ROOT_DIR=%ADAO_PYTHON_ROOT_DIR:\=/%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DEFICAS_ROOT_DIR=%EFICAS_TOOLS_ROOT_DIR:\=/%
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 echo.
 echo *********************************************************************
diff --git a/products/compil_scripts/CAS_7.3.bat b/products/compil_scripts/CAS_7.3.bat
index abbce79..097e76c 100644
--- a/products/compil_scripts/CAS_7.3.bat
+++ b/products/compil_scripts/CAS_7.3.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -25,7 +25,8 @@ mkdir %BUILD_DIR%
 
 cd %BUILD_DIR%
 
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
+
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%
 
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
diff --git a/products/compil_scripts/CAS_7.4.bat b/products/compil_scripts/CAS_7.4.bat
index 81087e4..afcc486 100644
--- a/products/compil_scripts/CAS_7.4.bat
+++ b/products/compil_scripts/CAS_7.4.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -25,23 +25,19 @@ mkdir %BUILD_DIR%
 
 cd %BUILD_DIR%
 
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%
-
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
-
 REM TBB
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DUSE_TBB:BOOL=ON -D3RDPARTY_TBB_DIR:STRING=%TBB_DIR:\=/%
 REM FREETYPE
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DUSE_FREETYPE:BOOL=ON -D3RDPARTY_FREETYPE_DIR:STRING=%FREETYPEDIR:\=/%
 REM FREEIMAGE
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DUSE_FREEIMAGE:BOOL=ON -D3RDPARTY_FREEIMAGE_DIR:STRING=%FREEIMAGEDIR:\=/%
-
 REM no GL2PS
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DUSE_GL2PS:BOOL=OFF
-
 REM no TCL/TK
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DUSE_TCL=OFF -DBUILD_MODULE_Draw=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 set MSBUILDDISABLENODEREUSE=1
 
diff --git a/products/compil_scripts/CAS_7.5.bat b/products/compil_scripts/CAS_7.5.bat
index 879ea1d..2f1904a 100644
--- a/products/compil_scripts/CAS_7.5.bat
+++ b/products/compil_scripts/CAS_7.5.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -25,9 +25,8 @@ mkdir %BUILD_DIR%
 
 cd %BUILD_DIR%
 
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%
-
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
 
 REM TBB
diff --git a/products/compil_scripts/FMILibrary-2.0.3.bat b/products/compil_scripts/FMILibrary-2.0.3.bat
index a804c5c..5fd27b8 100644
--- a/products/compil_scripts/FMILibrary-2.0.3.bat
+++ b/products/compil_scripts/FMILibrary-2.0.3.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -28,7 +28,7 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DOpenBLAS_DIR=%OpenBLAS_DIR:\=/%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DFMILIB_GENERATE_DOXYGEN_DOC=OFF
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 cd %BUILD_DIR%
 
diff --git a/products/compil_scripts/HOMARD_MED_MINGW.bat b/products/compil_scripts/HOMARD_MED_MINGW.bat
index f55caeb..99d3b38 100644
--- a/products/compil_scripts/HOMARD_MED_MINGW.bat
+++ b/products/compil_scripts/HOMARD_MED_MINGW.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -45,7 +45,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX=%PRODUCT_INSTALL%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_HOMARD_TOOL_STANDALONE:BOOL=ON
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 set MSBUILDDISABLENODEREUSE=1
 
diff --git a/products/compil_scripts/OPENTURNS_SALOME.bat b/products/compil_scripts/OPENTURNS_SALOME.bat
index bcc800c..fb318a2 100644
--- a/products/compil_scripts/OPENTURNS_SALOME.bat
+++ b/products/compil_scripts/OPENTURNS_SALOME.bat
@@ -14,7 +14,7 @@ if %SAT_DEBUG% == 1 (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
@@ -125,7 +125,7 @@ echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%
 echo *********************************************************************
 echo.
 
-%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %CMAKE_OPTIONS% %SOURCE_DIR%
+%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% -A x64 %CMAKE_OPTIONS% %SOURCE_DIR%
 if NOT %ERRORLEVEL% == 0 (
     echo "ERROR on cmake"
     exit 1
diff --git a/products/compil_scripts/PERSALYS-v13.0.bat b/products/compil_scripts/PERSALYS-v13.0.bat
index 7202b1c..ff6d354 100644
--- a/products/compil_scripts/PERSALYS-v13.0.bat
+++ b/products/compil_scripts/PERSALYS-v13.0.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -32,7 +32,6 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DGUI_ROOT_DIR=%GUI_ROOT_DIR:\=/%
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DSalomeGUI_DIR=%GUI_ROOT_DIR:\=/%/adm_local/cmake_files
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DKERNEL_ROOT_DIR=%KERNEL_ROOT_DIR:\=/%
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DSalomeKERNEL_DIR=%KERNEL_ROOT_DIR:\=/%/salome_adm/cmake_files
-REM SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DOpenTURNS_DIR=$OT_ROOT_DIR/lib/cmake/openturns
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPy2cpp_DIR=%PY2CPP_ROOT_DIR:\=/%/lib/cmake/py2cpp
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DQWT_INCLUDE_DIR=%QWT_ROOT_DIR:\=/%/include
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DUSE_SPHINX=OFF
@@ -49,7 +48,7 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_EXECUTABLE=%PYTHONBIN:\=/%
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_INCLUDE_DIR=%PYTHON_INCLUDE:\=/%
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_FIND_ROOT_PATH=ON
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGNS_INCLUDE_DIR:PATH=%CGNS_ROOT_DIR:\=/%/include
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 set MSBUILDDISABLENODEREUSE=1
 
diff --git a/products/compil_scripts/PERSALYS-v14.0.1.bat b/products/compil_scripts/PERSALYS-v14.0.1.bat
index f092391..1b0c853 100644
--- a/products/compil_scripts/PERSALYS-v14.0.1.bat
+++ b/products/compil_scripts/PERSALYS-v14.0.1.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -123,7 +123,7 @@ echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%
 echo *********************************************************************
 echo.
 
-%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %CMAKE_OPTIONS% %SOURCE_DIR%
+%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% -A x64 %CMAKE_OPTIONS% %SOURCE_DIR%
 if NOT %ERRORLEVEL% == 0 (
     echo "ERROR on cmake"
     exit 1
diff --git a/products/compil_scripts/PERSALYS-v14.1.bat b/products/compil_scripts/PERSALYS-v14.1.bat
index cd4f0aa..7baee79 100644
--- a/products/compil_scripts/PERSALYS-v14.1.bat
+++ b/products/compil_scripts/PERSALYS-v14.1.bat
@@ -14,7 +14,7 @@ if %SAT_DEBUG% == 1 (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
@@ -123,7 +123,7 @@ echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%
 echo *********************************************************************
 echo.
 
-%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %CMAKE_OPTIONS% %SOURCE_DIR%
+%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% -A x64 %CMAKE_OPTIONS% %SOURCE_DIR%
 if NOT %ERRORLEVEL% == 0 (
     echo "ERROR on cmake"
     exit 1
diff --git a/products/compil_scripts/PERSALYS-v16.0.1.bat b/products/compil_scripts/PERSALYS-v16.0.1.bat
index cd4f0aa..7baee79 100644
--- a/products/compil_scripts/PERSALYS-v16.0.1.bat
+++ b/products/compil_scripts/PERSALYS-v16.0.1.bat
@@ -14,7 +14,7 @@ if %SAT_DEBUG% == 1 (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
@@ -123,7 +123,7 @@ echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%
 echo *********************************************************************
 echo.
 
-%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %CMAKE_OPTIONS% %SOURCE_DIR%
+%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% -A x64 %CMAKE_OPTIONS% %SOURCE_DIR%
 if NOT %ERRORLEVEL% == 0 (
     echo "ERROR on cmake"
     exit 1
diff --git a/products/compil_scripts/ParaView-5.10.0.bat b/products/compil_scripts/ParaView-5.10.0.bat
index ff7cd6d..a26a380 100644
--- a/products/compil_scripts/ParaView-5.10.0.bat
+++ b/products/compil_scripts/ParaView-5.10.0.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
@@ -167,7 +167,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCATALYST_BUILD_STUB_IMPLEMENTATION:BOOL=ON
 REM allow additional plugins
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_ALL_NEW_OBJECT_FACTORY:BOOL=ON
 
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 cd %BUILD_DIR%
 echo.
diff --git a/products/compil_scripts/ParaView-5.11.0.bat b/products/compil_scripts/ParaView-5.11.0.bat
index 1f4db32..2bef478 100644
--- a/products/compil_scripts/ParaView-5.11.0.bat
+++ b/products/compil_scripts/ParaView-5.11.0.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
@@ -213,7 +213,7 @@ IF DEFINED OT_VERSION (
   set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_ENABLE_OPENTURNS=ON -DOpenTURNS_DIR=%OT_ROOT_DIR:\=/%/lib/cmake/openturns
 )
 
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 cd %BUILD_DIR%
 
 echo.
diff --git a/products/compil_scripts/ParaView-5.12.0.bat b/products/compil_scripts/ParaView-5.12.0.bat
index 1f4db32..2bef478 100644
--- a/products/compil_scripts/ParaView-5.12.0.bat
+++ b/products/compil_scripts/ParaView-5.12.0.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
@@ -213,7 +213,7 @@ IF DEFINED OT_VERSION (
   set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_ENABLE_OPENTURNS=ON -DOpenTURNS_DIR=%OT_ROOT_DIR:\=/%/lib/cmake/openturns
 )
 
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 cd %BUILD_DIR%
 
 echo.
diff --git a/products/compil_scripts/ParaView-5.6.0_bfaf7b8.bat b/products/compil_scripts/ParaView-5.6.0_bfaf7b8.bat
index 30cf415..b723fab 100644
--- a/products/compil_scripts/ParaView-5.6.0_bfaf7b8.bat
+++ b/products/compil_scripts/ParaView-5.6.0_bfaf7b8.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
@@ -155,7 +155,7 @@ if defined OSPRAY_ROOT_DIR (
    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_USE_OSPRAY:BOOL=ON -DOSPRAY_INSTALL_DIR:STRING=%OSPRAY_ROOT_DIR:\=/%
 )
 
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 cd %BUILD_DIR%
 echo.
diff --git a/products/compil_scripts/ParaView-5.8.0.bat b/products/compil_scripts/ParaView-5.8.0.bat
index 23ee4a7..882c75d 100644
--- a/products/compil_scripts/ParaView-5.8.0.bat
+++ b/products/compil_scripts/ParaView-5.8.0.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
@@ -164,7 +164,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_PLUGIN_ENABLE_pvblot:BOOL=OFF
 REM allow additional plugins
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_ALL_NEW_OBJECT_FACTORY:BOOL=ON
 
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 cd %BUILD_DIR%
 echo.
diff --git a/products/compil_scripts/ParaView-5.9.0.bat b/products/compil_scripts/ParaView-5.9.0.bat
index 2ff85d1..56db009 100644
--- a/products/compil_scripts/ParaView-5.9.0.bat
+++ b/products/compil_scripts/ParaView-5.9.0.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
@@ -175,7 +175,7 @@ if "%SALOME_APPLICATION_NAME%" == "ALAMOS" (
   set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_ENABLE_VTK_PythonContext2D=YES -DVTK_MODULE_ENABLE_VTK_IOExportPDF=YES
 )
 
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 cd %BUILD_DIR%
 echo.
diff --git a/products/compil_scripts/ParaView-5.9.1.bat b/products/compil_scripts/ParaView-5.9.1.bat
index ff7cd6d..a26a380 100644
--- a/products/compil_scripts/ParaView-5.9.1.bat
+++ b/products/compil_scripts/ParaView-5.9.1.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
@@ -167,7 +167,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCATALYST_BUILD_STUB_IMPLEMENTATION:BOOL=ON
 REM allow additional plugins
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_ALL_NEW_OBJECT_FACTORY:BOOL=ON
 
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 cd %BUILD_DIR%
 echo.
diff --git a/products/compil_scripts/ParaView.bat b/products/compil_scripts/ParaView.bat
index ef40237..cb73ba5 100644
--- a/products/compil_scripts/ParaView.bat
+++ b/products/compil_scripts/ParaView.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
@@ -150,7 +150,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_PLUGIN_ENABLE_SierraPlotTools:BOOL=
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_PLUGIN_ENABLE_PacMan:BOOL=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_PLUGIN_ENABLE_pvblot:BOOL=OFF
 
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 cd %BUILD_DIR%
 echo.
diff --git a/products/compil_scripts/TTK.bat b/products/compil_scripts/TTK.bat
index 2225ac9..71709e9 100644
--- a/products/compil_scripts/TTK.bat
+++ b/products/compil_scripts/TTK.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -31,7 +31,6 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_LIBDIR:STRING=lib
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DTTK_BUILD_PARAVIEW_PLUGINS=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dembree_DIR:PATH=%EMBREE_ROOT_DIR:\=/%/lib/cmake/embree-3.12.2
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DEMBREE_INCLUDE_DIR=%EMBREE_ROOT_DIR:\=/%/include
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 REM Boost settings
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_ROOT:PATH=%BOOST_ROOT_DIR:\=/%
@@ -44,6 +43,7 @@ rem SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_USE_STATIC_LIBS=OFF
 REM SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_ENABLE_ttkCinemaWriter=NO
 REM SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_ENABLE_ttkCinemaQuery=NO
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_NO_BOOST_CMAKE=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 cd %BUILD_DIR%
 
 echo.
diff --git a/products/compil_scripts/YDEFX.bat b/products/compil_scripts/YDEFX.bat
index 60a4d11..a971f30 100644
--- a/products/compil_scripts/YDEFX.bat
+++ b/products/compil_scripts/YDEFX.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -29,7 +29,7 @@ SET CMAKE_OPTIONS=
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 cd %BUILD_DIR%
 
diff --git a/products/compil_scripts/boost_V1.79.0.bat b/products/compil_scripts/boost_V1.79.0.bat
index be32e1b..ddc47ca 100644
--- a/products/compil_scripts/boost_V1.79.0.bat
+++ b/products/compil_scripts/boost_V1.79.0.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=release
diff --git a/products/compil_scripts/bsd_xdr.bat b/products/compil_scripts/bsd_xdr.bat
index 1c03ee8..fc2f56f 100755
--- a/products/compil_scripts/bsd_xdr.bat
+++ b/products/compil_scripts/bsd_xdr.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=release
@@ -22,7 +22,7 @@ if exist "%PRODUCT_INSTALL%" rmdir /Q /S "%PRODUCT_INSTALL%"
 mkdir %PRODUCT_INSTALL%
 
 set CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 set MSBUILDDISABLENODEREUSE=1
 
diff --git a/products/compil_scripts/cgns.bat b/products/compil_scripts/cgns.bat
index 354844b..2ec767e 100755
--- a/products/compil_scripts/cgns.bat
+++ b/products/compil_scripts/cgns.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -39,7 +39,7 @@ if "%VERSION%" == "4.2.0" (
     SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGNS_ENABLE_64BIT:BOOL=OFF
 )
 
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 cd %BUILD_DIR%
 
diff --git a/products/compil_scripts/cmake.bat b/products/compil_scripts/cmake.bat
index 8f4ef55..7de043f 100644
--- a/products/compil_scripts/cmake.bat
+++ b/products/compil_scripts/cmake.bat
@@ -6,7 +6,7 @@ echo ##########################################################################
 
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
@@ -24,11 +24,7 @@ rem # Configuration
 rem # According to cmake README, cmake is mandatory for compiling cmake on windows
 set CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=Release
-if "%SALOME_APPLICATION_NAME%" == "URANIE" (
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A Win32 -Thost=x64
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_SYSTEM_VERSION=10.0.19041.0
-)
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 set MSBUILDDISABLENODEREUSE=1
 
diff --git a/products/compil_scripts/cminpack-1.3.6.bat b/products/compil_scripts/cminpack-1.3.6.bat
index 1508c26..274f2f5 100644
--- a/products/compil_scripts/cminpack-1.3.6.bat
+++ b/products/compil_scripts/cminpack-1.3.6.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -27,7 +27,7 @@ SET CMAKE_OPTIONS=
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DOpenBLAS_DIR=%OpenBLAS_DIR:\=/%
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 cd %BUILD_DIR%
 
diff --git a/products/compil_scripts/eigen.bat b/products/compil_scripts/eigen.bat
index 742558d..0244d71 100644
--- a/products/compil_scripts/eigen.bat
+++ b/products/compil_scripts/eigen.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -27,7 +27,7 @@ cd %BUILD_DIR%
 set CMAKE_OPTIONS=
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% 
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 echo.
 echo *********************************************************************
diff --git a/products/compil_scripts/fftw-3.3.9.bat b/products/compil_scripts/fftw-3.3.9.bat
index ee1edcb..2bf5e38 100644
--- a/products/compil_scripts/fftw-3.3.9.bat
+++ b/products/compil_scripts/fftw-3.3.9.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -25,7 +25,8 @@ mkdir %BUILD_DIR%
 SET CMAKE_OPTIONS=
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A x64
 
 cd %BUILD_DIR%
 set PATH=%BUILD_DIR%\bin;%PATH%
diff --git a/products/compil_scripts/gl2ps.bat b/products/compil_scripts/gl2ps.bat
index 05438db..7546887 100755
--- a/products/compil_scripts/gl2ps.bat
+++ b/products/compil_scripts/gl2ps.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -29,7 +29,7 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_GLUT=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_PNG=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_ZLIB=ON
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 set MSBUILDDISABLENODEREUSE=1
 
diff --git a/products/compil_scripts/gmsh-4.10.3.bat b/products/compil_scripts/gmsh-4.10.3.bat
index d00f196..6e04a5a 100644
--- a/products/compil_scripts/gmsh-4.10.3.bat
+++ b/products/compil_scripts/gmsh-4.10.3.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -43,7 +43,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_CGNS=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_TESTS=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_PLUGINS=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_OPENMP=OFF
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR:STRING=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 set MSBUILDDISABLENODEREUSE=1
 
 echo.
diff --git a/products/compil_scripts/gmsh-4.8.4.bat b/products/compil_scripts/gmsh-4.8.4.bat
index 889044e..0dbfcfb 100644
--- a/products/compil_scripts/gmsh-4.8.4.bat
+++ b/products/compil_scripts/gmsh-4.8.4.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -42,7 +42,9 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_PRIVATE_API=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_CGNS=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_TESTS=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_PLUGINS=OFF
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A x64
+  
 set MSBUILDDISABLENODEREUSE=1
 
 echo.
diff --git a/products/compil_scripts/gmsh.bat b/products/compil_scripts/gmsh.bat
index c1aea9f..f4793d1 100644
--- a/products/compil_scripts/gmsh.bat
+++ b/products/compil_scripts/gmsh.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -43,8 +43,8 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_CGNS=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_HXT=OFF 
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_SOLVER=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_GMM=ON
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_BLAS_LAPACK=OFF
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 set MSBUILDDISABLENODEREUSE=1
 
 echo.
diff --git a/products/compil_scripts/graphviz-2.44.1.bat b/products/compil_scripts/graphviz-2.44.1.bat
index d8c585d..cc95392 100644
--- a/products/compil_scripts/graphviz-2.44.1.bat
+++ b/products/compil_scripts/graphviz-2.44.1.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -31,7 +31,7 @@ set CMAKE_OPTIONS=
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX=%PRODUCT_INSTALL%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_SHARED_LIBS:BOOL=ON
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 set MSBUILDDISABLENODEREUSE=1
 
diff --git a/products/compil_scripts/graphviz.bat b/products/compil_scripts/graphviz.bat
index fa5e15e..463f595 100644
--- a/products/compil_scripts/graphviz.bat
+++ b/products/compil_scripts/graphviz.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -27,7 +27,7 @@ cd %BUILD_DIR%
 set CMAKE_OPTIONS=
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX=%PRODUCT_INSTALL%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE%
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 set MSBUILDDISABLENODEREUSE=1
 
diff --git a/products/compil_scripts/hdf5CMake.bat b/products/compil_scripts/hdf5CMake.bat
index 904a4ae..4719995 100755
--- a/products/compil_scripts/hdf5CMake.bat
+++ b/products/compil_scripts/hdf5CMake.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -38,7 +38,7 @@ if DEFINED SAT_HPC (
 ) else (
     SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_ENABLE_PARALLEL:BOOL=OFF
 )
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 set MSBUILDDISABLENODEREUSE=1
 
diff --git a/products/compil_scripts/ispc.bat b/products/compil_scripts/ispc.bat
index dac40fa..89cc241 100644
--- a/products/compil_scripts/ispc.bat
+++ b/products/compil_scripts/ispc.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -37,7 +37,7 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_EXECUTABLE=%PYTHON_ROOT_DIR:\=/%/python.exe
-SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 cd %BUILD_DIR%
 
diff --git a/products/compil_scripts/lata.bat b/products/compil_scripts/lata.bat
index db0f2c2..cc98669 100644
--- a/products/compil_scripts/lata.bat
+++ b/products/compil_scripts/lata.bat
@@ -5,7 +5,7 @@ echo Installing LATA %VERSION%
 echo ##########################################################################
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
@@ -56,8 +56,8 @@ echo INFO: running cmake -DVisItBridgePlugin_SOURCE_DIR=%BUILD_DIR%\VisItLib
 cd %BUILD_DIR%\build_paraview
 
 SET CMAKE_OPTIONS=-DCMAKE_BUILD_TYPE:STRING=Release
-SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVisItBridgePlugin_SOURCE_DIR=%BUILD_DIR:\=/%/VisItLib 
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 cmake %CMAKE_OPTIONS%
 if NOT %ERRORLEVEL% == 0 (
     echo ERROR: failed to run command: cmake %CMAKE_OPTIONS%
diff --git a/products/compil_scripts/llvm-8.0.1.bat b/products/compil_scripts/llvm-8.0.1.bat
index 5ebb2c9..2e3a603 100644
--- a/products/compil_scripts/llvm-8.0.1.bat
+++ b/products/compil_scripts/llvm-8.0.1.bat
@@ -5,7 +5,7 @@ echo llvm %VERSION%
 echo ##########################################################################
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 REM NGH: no need to build this in debug mode
@@ -25,7 +25,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_EXECUTABLE:STRING=%PYTHON_ROOT_DIR:\=
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLLVM_INSTALL_UTILS:BOOL=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLLVM_ENABLE_DUMP:BOOL=ON 
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -Thost=x64
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 set MSBUILDDISABLENODEREUSE=1
 
 echo.
diff --git a/products/compil_scripts/medCMake.bat b/products/compil_scripts/medCMake.bat
index 883450f..bfb14c9 100755
--- a/products/compil_scripts/medCMake.bat
+++ b/products/compil_scripts/medCMake.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -39,7 +39,7 @@ if DEFINED SAT_HPC (
     SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_USE_MPI:BOOL=OFF
 )
 
-SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 cd %BUILD_DIR%
 
diff --git a/products/compil_scripts/metis-5.1.0.bat b/products/compil_scripts/metis-5.1.0.bat
index cc71344..1e600af 100755
--- a/products/compil_scripts/metis-5.1.0.bat
+++ b/products/compil_scripts/metis-5.1.0.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -29,8 +29,8 @@ if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
 mkdir %BUILD_DIR%
 cd %BUILD_DIR%
 
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 set MSBUILDDISABLENODEREUSE=1
 
diff --git a/products/compil_scripts/netgen-6.2.2101.bat b/products/compil_scripts/netgen-6.2.2101.bat
index 5abd8a5..e4632db 100644
--- a/products/compil_scripts/netgen-6.2.2101.bat
+++ b/products/compil_scripts/netgen-6.2.2101.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -39,7 +39,7 @@ cd %CMAKE_PRODUCT_BUILD_DIR%
 
 set CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX:STRING=%CMAKE_PRODUCT_INSTALL_DIR:\=/%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=Release
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 echo.
 echo --------------------------------------------------------------------------
@@ -98,7 +98,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DUSE_NATIVE_ARCH=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_CXX_STANDARD=17
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX=%PRODUCT_INSTALL:\=/%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE%
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 set MSBUILDDISABLENODEREUSE=1
 
diff --git a/products/compil_scripts/netgen.bat b/products/compil_scripts/netgen.bat
index 3054ea8..60df65b 100644
--- a/products/compil_scripts/netgen.bat
+++ b/products/compil_scripts/netgen.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -30,7 +30,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX=%PRODUCT_INSTALL%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_ROOT_DIR=%ZLIB_DIR%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCASROOT=%CASROOT%
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 set MSBUILDDISABLENODEREUSE=1
 
diff --git a/products/compil_scripts/netgen_5_3_1.bat b/products/compil_scripts/netgen_5_3_1.bat
index e0a1011..87979ac 100755
--- a/products/compil_scripts/netgen_5_3_1.bat
+++ b/products/compil_scripts/netgen_5_3_1.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -33,11 +33,10 @@ dos2unix -q %SOURCE_DIR%/libsrc/occ/*
 dos2unix -q %SOURCE_DIR%/libsrc/nglib/*
 
 set CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
-set MSBUILDDISABLENODEREUSE=1
-
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_ROOT_DIR=%ZLIB_DIR%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCASROOT=%CASROOT%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
+set MSBUILDDISABLENODEREUSE=1
 
 cd %BUILD_DIR%
 
diff --git a/products/compil_scripts/openVKL-0.11.0.bat b/products/compil_scripts/openVKL-0.11.0.bat
index e29f1c0..9df1474 100644
--- a/products/compil_scripts/openVKL-0.11.0.bat
+++ b/products/compil_scripts/openVKL-0.11.0.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -38,7 +38,7 @@ SET CMAKE_OPYIONS=%CMAKE_OPTIONS% -DBUILD_RKCOMMON=OFF
 SET CMAKE_OPYIONS=%CMAKE_OPTIONS% -DBUILD_EMBREE=OFF
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DRKCOMMON_TBB_ROOT=%TBB_ROOT_DIR:\=/%
-SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 cd %BUILD_DIR%
 
 echo.
diff --git a/products/compil_scripts/openblas-0.3.23.bat b/products/compil_scripts/openblas-0.3.23.bat
index a7251c6..d432c44 100644
--- a/products/compil_scripts/openblas-0.3.23.bat
+++ b/products/compil_scripts/openblas-0.3.23.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -27,7 +27,7 @@ mkdir %BUILD_DIR%
 SET CMAKE_OPTIONS=
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 cd %BUILD_DIR%
 
diff --git a/products/compil_scripts/opencv.bat b/products/compil_scripts/opencv.bat
index 3680921..a8f4483 100755
--- a/products/compil_scripts/opencv.bat
+++ b/products/compil_scripts/opencv.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -38,7 +38,7 @@ if %SAT_DEBUG% == 0 (
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_opencv_java:STRING=OFF
 REM OpenBLAS triggers a compilation issue / So stay as we were before the introduction of OpenBLAS
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DWITH_LAPACK:BOOL=OFF
-SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 cd %BUILD_DIR%
 
diff --git a/products/compil_scripts/openturns-1.20.1.bat b/products/compil_scripts/openturns-1.20.1.bat
index 94ef02c..9faaeef 100644
--- a/products/compil_scripts/openturns-1.20.1.bat
+++ b/products/compil_scripts/openturns-1.20.1.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 SET PRODUCT_BUILD_TYPE=Release
 
@@ -53,9 +53,9 @@ GOTO:MAIN
 
     echo.
     echo --------------------------------------------------------------------------
-    echo *** %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR%  %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR%
+    echo *** %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR%  -A x64 %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR%
     echo --------------------------------------------------------------------------
-    %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR%
+    %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% -A x64 %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR%
     if NOT %ERRORLEVEL% == 0 (
       echo ERROR on cmake
       exit 1
diff --git a/products/compil_scripts/openturns-1.21.bat b/products/compil_scripts/openturns-1.21.bat
index b030b44..f8fbf5b 100644
--- a/products/compil_scripts/openturns-1.21.bat
+++ b/products/compil_scripts/openturns-1.21.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 SET PRODUCT_BUILD_TYPE=Release
 
@@ -50,9 +50,9 @@ GOTO:MAIN
 
     echo.
     echo --------------------------------------------------------------------------
-    echo *** %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR%  %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR%
+    echo *** %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% -A x64 %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR%
     echo --------------------------------------------------------------------------
-    %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR%
+    %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% -A x64 %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR%
     if NOT %ERRORLEVEL% == 0 (
       echo ERROR on cmake
       exit 1
diff --git a/products/compil_scripts/openturns-1.22.bat b/products/compil_scripts/openturns-1.22.bat
index a84f383..7d1e5ac 100644
--- a/products/compil_scripts/openturns-1.22.bat
+++ b/products/compil_scripts/openturns-1.22.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 SET PRODUCT_BUILD_TYPE=Release
 
@@ -50,9 +50,9 @@ GOTO:MAIN
 
     echo.
     echo --------------------------------------------------------------------------
-    echo *** %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR%  %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR%
+    echo *** %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR%  -A x64 %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR%
     echo --------------------------------------------------------------------------
-    %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR%
+    %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% -A x64 %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR%
     if NOT %ERRORLEVEL% == 0 (
       echo ERROR on cmake
       exit 1
diff --git a/products/compil_scripts/planegcs.bat b/products/compil_scripts/planegcs.bat
index 62319c2..58b5368 100644
--- a/products/compil_scripts/planegcs.bat
+++ b/products/compil_scripts/planegcs.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -33,7 +33,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_ROOT:PATH=%BOOST_ROOT_DIR:\=/%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_ADDITIONAL_VERSIONS="%BOOST_VERSION% %BOOST_VERSION_MajorMinor%"
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_INCLUDEDIR=%Boost_INCLUDE_DIR:\=/%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_INCLUDE_DIR=%Boost_INCLUDE_DIR:\=/%
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 
 set MSBUILDDISABLENODEREUSE=1
 
diff --git a/products/compil_scripts/zlib-1.2.11.bat b/products/compil_scripts/zlib-1.2.11.bat
index fae67e0..904485f 100644
--- a/products/compil_scripts/zlib-1.2.11.bat
+++ b/products/compil_scripts/zlib-1.2.11.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"
 )
 
 SET PRODUCT_BUILD_TYPE=Release
@@ -30,12 +30,12 @@ mkdir %BUILD_DIR%
 cd %BUILD_DIR%
 set CMAKE_OPTIONS=
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE%s
 if %PLATFORM_TARGET% == Win32 (
   set CMAKE_OPTIONS=%CMAKE_OPTIONS% -A Win32 -Thost=x64 -DCMAKE_SYSTEM_VERSION=10.0.19041.0
+) else (
+  set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64
 )
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR:STRING=%CMAKE_GENERATOR%
-
 set MSBUILDDISABLENODEREUSE=1
 
 echo.