rely on non empty %SALOME_APPLICATION_NAME% to target URANIE

diff --git a/applications/MEDCOUPLING-9.4.0-windows.pyconf b/applications/MEDCOUPLING-9.4.0-windows.pyconf
index 0e3bb2b257495d1e5698a6efaa2c215838103402..60f4ec1aef693edbb05f74fb54b908f11e3d5edb 100644 (file)
--- a/applications/MEDCOUPLING-9.4.0-windows.pyconf
+++ b/applications/MEDCOUPLING-9.4.0-windows.pyconf
@@ -17,6 +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...
         }
         launch :
         {

diff --git a/applications/MEDCOUPLING-9.5.0-windows.pyconf b/applications/MEDCOUPLING-9.5.0-windows.pyconf
index 50d8007e9597caa4eace84ee59e6e1aa6b2dfdd4..b9cb7ce3165e2a92ae932d751143f1605df56c17 100644 (file)
--- a/applications/MEDCOUPLING-9.5.0-windows.pyconf
+++ b/applications/MEDCOUPLING-9.5.0-windows.pyconf
@@ -17,6 +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...
         }
         launch :
         {

diff --git a/applications/MEDCOUPLING-9.6.0-windows.pyconf b/applications/MEDCOUPLING-9.6.0-windows.pyconf
index ae9d1be1238fc190f56e0cad83fc66dbd2b3c1bb..530dac9c2f92b576895b7ffcbec42b222c80b77e 100644 (file)
--- a/applications/MEDCOUPLING-9.6.0-windows.pyconf
+++ b/applications/MEDCOUPLING-9.6.0-windows.pyconf
@@ -17,6 +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...
         }
         launch :
         {

diff --git a/applications/MEDCOUPLING-9.7.0-windows.pyconf b/applications/MEDCOUPLING-9.7.0-windows.pyconf
index ab34870650b906d0af8a0e4f71266849934bde6b..1406416e41945f301f02c596dea8fc47c71c0b57 100644 (file)
--- a/applications/MEDCOUPLING-9.7.0-windows.pyconf
+++ b/applications/MEDCOUPLING-9.7.0-windows.pyconf
@@ -17,6 +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...
         }
         launch :
         {

diff --git a/applications/MEDCOUPLING-master-windows.pyconf b/applications/MEDCOUPLING-master-windows.pyconf
index e6d9e2392630eccda8a731d7c0dfbb8b672e2860..9b9eb4c29c514fc5e917105de0c4f3bd0b5a6e56 100644 (file)
--- a/applications/MEDCOUPLING-master-windows.pyconf
+++ b/applications/MEDCOUPLING-master-windows.pyconf
@@ -17,6 +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...
         }
         launch :
         {

diff --git a/applications/SALOME-9.6.0-windows.pyconf b/applications/SALOME-9.6.0-windows.pyconf
index f11420d400381e9d8f821accff06aec98584485a..6c15acf143eb3744fe2921c61dfcc3ee1b1b5f60 100644 (file)
--- a/applications/SALOME-9.6.0-windows.pyconf
+++ b/applications/SALOME-9.6.0-windows.pyconf
@@ -21,6 +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"'
         }
         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 f55bc827b3a322751491b1f4e29741eac6b45b6e..fe606851ba1f5c93377bef14c9be4a4e481be4a6 100644 (file)
--- a/applications/SALOME-9.7.0-windows.pyconf
+++ b/applications/SALOME-9.7.0-windows.pyconf
@@ -21,6 +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"'
         }
         launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
         SALOME_trace : "local" # local/file:.../with_logger

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index e3f6bf9870a92c56f7682879adc84733f286ac93..00a1efa0274800a4be5bd7a3e00c303c21eb115c 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -21,7 +21,7 @@ APPLICATION :
            SALOME_HAS_GLOBAL_ENV : "1"
            SALOME_USE_64BIT_IDS : '1'
            SET_usr_docs_VARS : "1" # required for PyEditor build
-           SALOME_APPLICATION_NAME : "SALOME"
+           CMAKE_GENERATOR : '"Visual Studio 15 2017 Win64"'
         }
         launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
         SALOME_trace : "local" # local/file:.../with_logger

diff --git a/products/compil_scripts/Python-3.6.5.bat b/products/compil_scripts/Python-3.6.5.bat
index c2af50d475cc2079cbf3027bc63465f8e1aeccb6..7f319eaec3a3e364daf42d8e0c0a3d8cccee684f 100644 (file)
--- a/products/compil_scripts/Python-3.6.5.bat
+++ b/products/compil_scripts/Python-3.6.5.bat
@@ -14,7 +14,7 @@ if %SAT_DEBUG% == 1 (
 )
 
 set PLATFORM_TARGET=x64
-if defined SALOME_APPLICATION_NAME if %SALOME_APPLICATION_NAME% == URANIE (
+if "%SALOME_APPLICATION_NAME%" == "URANIE" (
   set PLATFORM_TARGET=Win32
 )
 

diff --git a/products/compil_scripts/Python-3.7.9.bat b/products/compil_scripts/Python-3.7.9.bat
index 8f36bfb1e69107c3684a2486be1b064a6cb6d86f..a93703c9e5562a84f82576a324a8abdcd59856d7 100644 (file)
--- a/products/compil_scripts/Python-3.7.9.bat
+++ b/products/compil_scripts/Python-3.7.9.bat
@@ -14,7 +14,7 @@ if %SAT_DEBUG% == 1 (
 )
 
 set PLATFORM_TARGET=x64
-if defined SALOME_APPLICATION_NAME if %SALOME_APPLICATION_NAME% == URANIE (
+if "%SALOME_APPLICATION_NAME%" == "URANIE" (
   set PLATFORM_TARGET=Win32
 )
 

diff --git a/products/compil_scripts/boost_V1.67.0.bat b/products/compil_scripts/boost_V1.67.0.bat
index f6b53339f1056b1980a03fbc4e2a39611777057c..0b13867a2ebb55014e69d7dcb333c243ed3d174d 100644 (file)
--- a/products/compil_scripts/boost_V1.67.0.bat
+++ b/products/compil_scripts/boost_V1.67.0.bat
@@ -32,7 +32,7 @@ echo *** Compilation
 echo --------------------------------------------------------------------------
 
 set PLATFORM_TARGET=64
-if defined SALOME_APPLICATION_NAME if %SALOME_APPLICATION_NAME% == URANIE (
+if "%SALOME_APPLICATION_NAME%" == URANIE (
   set PLATFORM_TARGET=32
 )
 

diff --git a/products/compil_scripts/cmake.bat b/products/compil_scripts/cmake.bat
index 23c7d596cadebdd0e214f76fee03d25197cb6831..eb16a00151951692677cf40c8d7edb57f4356ebb 100644 (file)
--- a/products/compil_scripts/cmake.bat
+++ b/products/compil_scripts/cmake.bat
@@ -11,17 +11,17 @@ if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
 mkdir %BUILD_DIR%
 
 set PLATFORM_TARGET=x64
-if defined SALOME_APPLICATION_NAME if %SALOME_APPLICATION_NAME% == URANIE (
-  set PLATFORM_TARGET=Win32
+if "%SALOME_APPLICATION_NAME%" == "URANIE" (
+    set PLATFORM_TARGET=Win32
 )
 
 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 defined SALOME_APPLICATION_NAME 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
+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%
 

diff --git a/products/compil_scripts/cppunit.bat b/products/compil_scripts/cppunit.bat
index a2a1628445cdc8604c1959b16393c3d602ce412b..3242b31c42ce838207bf1cd3c24dd51be309b4d5 100755 (executable)
--- a/products/compil_scripts/cppunit.bat
+++ b/products/compil_scripts/cppunit.bat
@@ -9,7 +9,8 @@ IF NOT DEFINED SAT_DEBUG (
 )\r
 \r
 set PLATFORM_TARGET=x64\r
-if defined SALOME_APPLICATION_NAME if %SALOME_APPLICATION_NAME% == URANIE (\r
+\r
+if "%SALOME_APPLICATION_NAME%" == "URANIE" (\r
   set PLATFORM_TARGET=Win32\r
 )\r
 \r

diff --git a/products/compil_scripts/freeimage.bat b/products/compil_scripts/freeimage.bat
index 74a39da18edee56332f2aed139e0084483a83ad9..9c846ca7f3830c7903b17ff4c81d3a278976634f 100644 (file)
--- a/products/compil_scripts/freeimage.bat
+++ b/products/compil_scripts/freeimage.bat
@@ -15,7 +15,7 @@ if %SAT_DEBUG% == 1 (
 )
 
 set PLATFORM_TARGET=x64
-if defined SALOME_APPLICATION_NAME if %SALOME_APPLICATION_NAME% == URANIE (
+if "%SALOME_APPLICATION_NAME%" == "URANIE" (
   set PLATFORM_TARGET=Win32
 )
 

diff --git a/products/compil_scripts/freetype.bat b/products/compil_scripts/freetype.bat
index 9577cb67b0713993daefe5681fa4b522bf045a45..8f1ef441d7e82f79224c6bd0a5a40a615884a955 100755 (executable)
--- a/products/compil_scripts/freetype.bat
+++ b/products/compil_scripts/freetype.bat
@@ -14,7 +14,7 @@ if %SAT_DEBUG% == 1 (
 )\r
 \r
 set PLATFORM_TARGET=x64\r
-if defined SALOME_APPLICATION_NAME if %SALOME_APPLICATION_NAME% == URANIE (\r
+if "%SALOME_APPLICATION_NAME%" == "URANIE" (\r
   set PLATFORM_TARGET=Win32\r
 )\r
 \r

diff --git a/products/compil_scripts/lapack.bat b/products/compil_scripts/lapack.bat
index 54b568096b94fd58888a4a88d0fba1079a8ce8b9..339e3214ed83f9b3744c1d296e0465258857a61c 100644 (file)
--- a/products/compil_scripts/lapack.bat
+++ b/products/compil_scripts/lapack.bat
@@ -14,7 +14,7 @@ if %SAT_DEBUG% == 1 (
 )
 
 set PLATFORM_TARGET=x64
-if defined SALOME_APPLICATION_NAME if %SALOME_APPLICATION_NAME% == URANIE (
+if "%SALOME_APPLICATION_NAME%" == "URANIE" (
   set PLATFORM_TARGET=x86
 )
 

diff --git a/products/compil_scripts/nlopt.bat b/products/compil_scripts/nlopt.bat
index c125dcdb6da97106d3584b47a8590495ea553539..bbfa6ccdc36c1ff0d1648c65eaf20b0912302ee7 100644 (file)
--- a/products/compil_scripts/nlopt.bat
+++ b/products/compil_scripts/nlopt.bat
@@ -14,7 +14,7 @@ if %SAT_DEBUG% == 1 (
 )
 
 set PLATFORM_TARGET=x64
-if defined SALOME_APPLICATION_NAME if %SALOME_APPLICATION_NAME% == URANIE (
+if "%SALOME_APPLICATION_NAME%" == "URANIE" (
   set PLATFORM_TARGET=Win32
 )
 

diff --git a/products/compil_scripts/pthreads.bat b/products/compil_scripts/pthreads.bat
index f9921d87b5154b8035f0e19fd27f3ffc2e1fafdc..35c6f370a22e3e18a4ab7c2925ae1ee336b7d6a1 100755 (executable)
--- a/products/compil_scripts/pthreads.bat
+++ b/products/compil_scripts/pthreads.bat
@@ -14,7 +14,7 @@ if %SAT_DEBUG% == 1 (
 )
 
 set PLATFORM_TARGET=x64
-if defined SALOME_APPLICATION_NAME if %SALOME_APPLICATION_NAME% == URANIE (
+if "%SALOME_APPLICATION_NAME%" == "URANIE" (
   set PLATFORM_TARGET=Win32
 )
 

diff --git a/products/compil_scripts/zlib-1.2.11.bat b/products/compil_scripts/zlib-1.2.11.bat
index 96487ab260321dc5e54f3bd49c428df0aedd7774..5e6fab8a118c85b84436e5f9c74eb4fb06fa8790 100644 (file)
--- a/products/compil_scripts/zlib-1.2.11.bat
+++ b/products/compil_scripts/zlib-1.2.11.bat
@@ -14,7 +14,7 @@ if %SAT_DEBUG% == 1 (
 )
 
 set PLATFORM_TARGET=x64
-if defined SALOME_APPLICATION_NAME if %SALOME_APPLICATION_NAME% == URANIE (
+if "%SALOME_APPLICATION_NAME%" == "URANIE" (
   set PLATFORM_TARGET=Win32
 )
 

diff --git a/products/compil_scripts/zlib-1.2.5.bat b/products/compil_scripts/zlib-1.2.5.bat
index 96487ab260321dc5e54f3bd49c428df0aedd7774..5e6fab8a118c85b84436e5f9c74eb4fb06fa8790 100644 (file)
--- a/products/compil_scripts/zlib-1.2.5.bat
+++ b/products/compil_scripts/zlib-1.2.5.bat
@@ -14,7 +14,7 @@ if %SAT_DEBUG% == 1 (
 )
 
 set PLATFORM_TARGET=x64
-if defined SALOME_APPLICATION_NAME if %SALOME_APPLICATION_NAME% == URANIE (
+if "%SALOME_APPLICATION_NAME%" == "URANIE" (
   set PLATFORM_TARGET=Win32
 )