spns #41486 - normalise CMAKE_GENERATOR

diff --git a/applications/MEDCOUPLING-9.10.0-windows.pyconf b/applications/MEDCOUPLING-9.10.0-windows.pyconf
index ce321ee8aeb6e123d252ed7d5695c454e0dbba57..067ef9c7173a8f145c4008dffbf63cb8ea1e117f 100644 (file)
--- 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 5052b8ed99d23b038eabdc354426ea191683cca3..b54c13546aa9508c52044de13df4a6d17b2f4016 100644 (file)
--- 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 c20dca720dc8200d715bee5c90eb1b3c3bb14a2d..d1582e9b4657bc500b485e67f37c42662105fa28 100644 (file)
--- 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 f15baf98fc2770b7c49dabbab91cde74edaf367c..a760a60b9d23196788eb16534f9c3df1d1f15417 100644 (file)
--- 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 b50216428ddc1bbaf2f4059d17e4055492e82b26..5be4becffe637277db0f523a774b8a77ca19f7f5 100644 (file)
--- 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 b9cb7ce3165e2a92ae932d751143f1605df56c17..b2fc2f67f790290bf255430a35170a750bf34111 100644 (file)
--- 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 530dac9c2f92b576895b7ffcbec42b222c80b77e..5f40d35cd4094851571c0e068b33f8d9268839ae 100644 (file)
--- 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 1406416e41945f301f02c596dea8fc47c71c0b57..a89b3054b06b75e75850dfe107d465c9ed29034a 100644 (file)
--- 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 47728923d97b1165abf3c4746958a28a53f69c05..019459070c94c6c1814ddb298d649f4db75f6ed7 100644 (file)
--- 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 ff747fded5786f3fc8f38e6896d48af4bba8c3df..44ded944a159326aa2b5b6110190799c343dea50 100644 (file)
--- 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 2f9a414205d7cb62876a964962687be1590143d4..c7dc7d8c430c1a70e13ee80200bff8102fd93e11 100644 (file)
--- 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 49084e5abcfab47cb227c329f97cf5bc89a06d31..164508b59895d6fdeef805cfd8f9f47c2a5b3ff1 100644 (file)
--- 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 6c60d6fca680816de18213d504b361a8484547aa..6561a6faf81071fa6b4a63367309b9fd2ae1773c 100644 (file)
--- 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 318b6b3787dd29618c2fd381b48155d74c018953..680649211d1fa355231b16b703df2761f271ba19 100644 (file)
--- 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 1b21006bd559d6ded2b1579a3080862c778ad644..85ef05f2b711c4fb69d830b43a17b10eb72c1030 100644 (file)
--- 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 148d68dbe886d2bb9e6fb9aa04f381899135bff4..d93308e0abe126cb67652de9364143af228065dc 100644 (file)
--- 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 6c15acf143eb3744fe2921c61dfcc3ee1b1b5f60..c2c9a41bf7b90064637c85a591cb6bd45de06e12 100644 (file)
--- 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 fe606851ba1f5c93377bef14c9be4a4e481be4a6..dd6243a0dc01caccf5950fbe573e77d0437f797e 100644 (file)
--- 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 8e814d47bfafb7c11d98ab7e0f0641f6bda99be8..e5a8e0e4e43318f42a12845af5ee111411476392 100644 (file)
--- 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 e5572efe4c50611c08e10d9dd511fa0c811f1b27..3e7d5c329f86aefd3ca359c0256ec4e4880903c1 100644 (file)
--- 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 64bfd01f844ef78a523f3cb93c5c603618646fbf..b8e4ee239a85fdf80f9188a9b60913ab529befe5 100644 (file)
--- 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 729af33c2d15a5aaf8bd41885b71af6d0214c41d..7e9857d4f0b26a1e67ce109d203d5f461a96d69e 100644 (file)
--- 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 abbce795027594096556affc6ea8b7947b233893..097e76c14551369e304d25f60c0915fc8201a45e 100644 (file)
--- 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 81087e4d057df0c9a301e1e2d7cfe31a5bb6ca6f..afcc4862e22ea165bb48c8040afdb1ac32c5a51f 100644 (file)
--- 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 879ea1d8ba952cf785c00db5e4a9a2ebb3f0457d..2f1904ac1f468a52258fce7a0ae111401939b707 100644 (file)
--- 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 a804c5c596867699e81435ea332ae3622d003b14..5fd27b89a0e13965116d733889223238719e5149 100644 (file)
--- 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 f55caeb11353a3daf4fd93f250e111240cde9baa..99d3b38f69d24cef29dc4af2dd92b26ea75215ba 100644 (file)
--- 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 bcc800c6898c14ac43e55deb2099f57544deb53d..fb318a25ba3fd4c041f8560a552eba75fecec551 100644 (file)
--- 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 7202b1cee74f190f53b097b2c03468014bd179be..ff6d354bb9cda2c602ea9e8a9ce1629bc21c56a4 100644 (file)
--- 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 f092391912bc42cf603bb353dde1385be013c9ee..1b0c853458175f850ae89f1c8679256ffdfb2f85 100644 (file)
--- 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 cd4f0aa7e5c61ebbc120e96daadb0c55b719a256..7baee7973bff5f7bad6a0ea6ba84216a9a74839e 100644 (file)
--- 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 cd4f0aa7e5c61ebbc120e96daadb0c55b719a256..7baee7973bff5f7bad6a0ea6ba84216a9a74839e 100644 (file)
--- 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 ff7cd6df9c37cc3b24702b76f4da955f6f9ce96d..a26a380209f11a8ab3522a93dc4f46ec616e67cd 100644 (file)
--- 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 1f4db3212c7e40293b30233c1aba55b30a200431..2bef478accf3e771337f080c0846992cba885d7e 100644 (file)
--- 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 1f4db3212c7e40293b30233c1aba55b30a200431..2bef478accf3e771337f080c0846992cba885d7e 100644 (file)
--- 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 30cf4157c127b47401a7bf5653533158d5dc1965..b723fab58f67934ea11d304a388d069c831d5285 100644 (file)
--- 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 23ee4a7ee803901f040d33e2c160e43f615b2a29..882c75dcef0f13d444e0b34978fa80e8e4680c8d 100644 (file)
--- 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 2ff85d1189b22e622b4dcd9879f2a9f9524ac18d..56db0098dd9be54f801db989158c353bd1160014 100644 (file)
--- 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 ff7cd6df9c37cc3b24702b76f4da955f6f9ce96d..a26a380209f11a8ab3522a93dc4f46ec616e67cd 100644 (file)
--- 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 ef40237bbcab86458cc528591f1730e2652b5d6a..cb73ba536e7f4e9863f6aaa06fa80d42211e1c0f 100644 (file)
--- 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 2225ac9857a517bfda7dd5ce379efcbc5bdccdc6..71709e9704f6250663d671b431f440b17af4ec0e 100644 (file)
--- 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 60a4d11269019230132de10d4fd86fb5ba03e82d..a971f3073334fd57a020553b9ca1fa7b83b43ad7 100644 (file)
--- 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 be32e1b9389c56f1148936f4a0fc222d2f042e03..ddc47ca287a26b1675c4f3e6c4b81410fd7b31b2 100644 (file)
--- 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 1c03ee8bc343ace414f4aeda9eb87eefc927954d..fc2f56faf3fe787356cb59847e9b73678c3a1cab 100755 (executable)
--- 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 354844ba13c2d39724537b5ebd2e1807fd0dd920..2ec767e4b77fdd46dd036a7d9307c41de3b945fd 100755 (executable)
--- 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 8f4ef554d66ed5a7cf7c255f4eb95f546dfb329d..7de043f30b0632f77810f29e4e7b55e6da5b6cf1 100644 (file)
--- 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 1508c269287a47ed11eb3af9bc0367a60c138382..274f2f59b81d0ca1b4990448e9f27259a6c4e92b 100644 (file)
--- 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 742558d5c01cb587161ca73c6715d2606e83133f..0244d7189b038148c6f47e8f4161b7540c15c2cf 100644 (file)
--- 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 ee1edcbda61eb0a1b4e034dea46fb8de9f4e359a..2bf5e3886fbb634ed9270aac8155153b49a6bad3 100644 (file)
--- 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 05438dbf31ce4356cbd9de7841823a8793feb17b..754688741d197d3e472a3ab0ab85626348330f8b 100755 (executable)
--- 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 d00f196f4c72379cb0b01497827763eea82413bb..6e04a5ab3ae550dd1f30e4ba1faf2f6d5e04bb1a 100644 (file)
--- 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 889044e36f4595072fc7312dc3c6227dc35402a4..0dbfcfb563678d503ed74542681d213275b38d45 100644 (file)
--- 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 c1aea9f017e8b17b6866b6e057c048cb274b274e..f4793d1b23eda693b18908383e86c1c83a99b9e1 100644 (file)
--- 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 d8c585def1923039d4ebed4cf328095b94d08053..cc95392921e26a4d03c7335f879556a5fd195c2a 100644 (file)
--- 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 fa5e15e8516ef8e67dbdc16725c9551dfbd82b0d..463f5955b1cb32bd9f9d5375a757c17f22d96c92 100644 (file)
--- 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 904a4aefc82f3c29a3afa890245fc8b6b83abd3b..4719995540cba514a2865a7c79f7ea47effd8534 100755 (executable)
--- a/products/compil_scripts/hdf5CMake.bat
+++ b/products/compil_scripts/hdf5CMake.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )\r
 \r
 IF NOT DEFINED CMAKE_GENERATOR (\r
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"\r
 )\r
 \r
 SET PRODUCT_BUILD_TYPE=Release\r
@@ -38,7 +38,7 @@ if DEFINED SAT_HPC (
 ) else (\r
     SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_ENABLE_PARALLEL:BOOL=OFF\r
 )\r
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64\r
 \r
 set MSBUILDDISABLENODEREUSE=1\r
 \r

diff --git a/products/compil_scripts/ispc.bat b/products/compil_scripts/ispc.bat
index dac40fa41df503d2e0efafcf0add180e50e7c4b3..89cc241480f8be273b1b5b8a5ab1f5cfd71f8fa6 100644 (file)
--- 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 db0f2c2c3c158241f1f20f0e0f0ba1d851fd72df..cc9866984e1aeeb2b220a1b8ef88302cffd006a1 100644 (file)
--- 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 5ebb2c94771802b01c9450a4834f6e086581f69a..2e3a603ecfbc68f039cb8535a835dc614b21a4bf 100644 (file)
--- 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 883450fddde5f8f2c702e70918db7f7321f1d372..bfb14c9bd792ebff7bf47c4cec5aefac1e120696 100755 (executable)
--- a/products/compil_scripts/medCMake.bat
+++ b/products/compil_scripts/medCMake.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )\r
 \r
 IF NOT DEFINED CMAKE_GENERATOR (\r
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"\r
 )\r
 \r
 SET PRODUCT_BUILD_TYPE=Release\r
@@ -39,7 +39,7 @@ if DEFINED SAT_HPC (
     SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_USE_MPI:BOOL=OFF\r
 )\r
 \r
-SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64\r
 \r
 cd %BUILD_DIR%\r
 \r

diff --git a/products/compil_scripts/metis-5.1.0.bat b/products/compil_scripts/metis-5.1.0.bat
index cc71344796a9486cc046f9996880bd448c753eb8..1e600afbcb4a6df496cb3a94dfcd0d7de13f4e89 100755 (executable)
--- 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 (
 )\r
 \r
 IF NOT DEFINED CMAKE_GENERATOR (\r
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"\r
 )\r
 \r
 SET PRODUCT_BUILD_TYPE=Release\r
@@ -29,8 +29,8 @@ if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
 mkdir %BUILD_DIR%\r
 cd %BUILD_DIR%\r
 \r
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%\r
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64\r
 \r
 set MSBUILDDISABLENODEREUSE=1\r
 \r

diff --git a/products/compil_scripts/netgen-6.2.2101.bat b/products/compil_scripts/netgen-6.2.2101.bat
index 5abd8a5d771e2ec2c9897050b0a986f9fa913659..e4632dbe4632587fd8cc27368ae7a12dc3d36e13 100644 (file)
--- 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 3054ea8addc365a689879377912d5f5a301c508c..60df65b6cd2eed0a892c270da0d277e708263403 100644 (file)
--- 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 e0a1011e1f5ddc8744b62f86bd805e390565a024..87979aca530b314fed5c24a6aa1cb9bc131e3c22 100755 (executable)
--- 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 (
 )\r
 \r
 IF NOT DEFINED CMAKE_GENERATOR (\r
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"\r
 )\r
 \r
 SET PRODUCT_BUILD_TYPE=Release\r
@@ -33,11 +33,10 @@ dos2unix -q %SOURCE_DIR%/libsrc/occ/*
 dos2unix -q %SOURCE_DIR%/libsrc/nglib/*\r
 \r
 set CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%\r
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
-set MSBUILDDISABLENODEREUSE=1\r
-\r
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_ROOT_DIR=%ZLIB_DIR%\r
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCASROOT=%CASROOT%\r
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64\r
+set MSBUILDDISABLENODEREUSE=1\r
 \r
 cd %BUILD_DIR%\r
 \r

diff --git a/products/compil_scripts/openVKL-0.11.0.bat b/products/compil_scripts/openVKL-0.11.0.bat
index e29f1c040d9fb3b7e071c2ec94d75599d7853117..9df1474b86ad4c0721fb29486678441d424621d3 100644 (file)
--- 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 a7251c6474eef9acf6178d00db230a59d60fc45e..d432c44c85b63f9c7b592e1cf51dd807d059e9ac 100644 (file)
--- 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 36809210a3dfa44c7f0091b6174bfa3bfc41f95d..a8f4483bd3c031fa7d86fd59fb104ff9202191ad 100755 (executable)
--- a/products/compil_scripts/opencv.bat
+++ b/products/compil_scripts/opencv.bat
@@ -9,7 +9,7 @@ IF NOT DEFINED SAT_DEBUG (
 )\r
 \r
 IF NOT DEFINED CMAKE_GENERATOR (\r
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
+  SET CMAKE_GENERATOR="Visual Studio 15 2017"\r
 )\r
 \r
 SET PRODUCT_BUILD_TYPE=Release\r
@@ -38,7 +38,7 @@ if %SAT_DEBUG% == 0 (
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_opencv_java:STRING=OFF\r
 REM OpenBLAS triggers a compilation issue / So stay as we were before the introduction of OpenBLAS\r
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DWITH_LAPACK:BOOL=OFF\r
-SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -G %CMAKE_GENERATOR% -A x64\r
 \r
 cd %BUILD_DIR%\r
 \r

diff --git a/products/compil_scripts/openturns-1.20.1.bat b/products/compil_scripts/openturns-1.20.1.bat
index 94ef02c42c73bd9ceed346d841b55bdc2ab59f66..9faaeef389e1b763a63ac4d977fb7b78a267731c 100644 (file)
--- 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 b030b447cbb2a2f605877e59928df8468cfced55..f8fbf5bf8f6e2c7430bc352b2234863768cf2dbd 100644 (file)
--- 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 a84f3838d9227f741ca4f81b24d45a0ae19a8f21..7d1e5acf4f5a52e05ef46f07463d51b484076e34 100644 (file)
--- 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 62319c2e2132e9c52c9d47bc71f7dbebbaae2803..58b5368ba5264f7cbc3e0d963d6cdd95e434aefe 100644 (file)
--- 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 fae67e024947b80233421cf27690d0b0a86be2db..904485f0d88a11fe3ba294756c066c92827e9272 100644 (file)
--- 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.