From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Fri, 28 May 2021 15:31:16 +0000 (+0200)
Subject: rely on non empty %SALOME_APPLICATION_NAME% to target URANIE
X-Git-Tag: V9_7_0~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fccbf500894ce1b9dcdfc808850712cda1f461d1;p=tools%2Fsat_salome.git

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 0e3bb2b..60f4ec1 100644
--- 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 50d8007..b9cb7ce 100644
--- 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 ae9d1be..530dac9 100644
--- 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 ab34870..1406416 100644
--- 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 e6d9e23..9b9eb4c 100644
--- 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 f11420d..6c15acf 100644
--- 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 f55bc82..fe60685 100644
--- 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 e3f6bf9..00a1efa 100644
--- 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 c2af50d..7f319ea 100644
--- 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 8f36bfb..a93703c 100644
--- 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 f6b5333..0b13867 100644
--- 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 23c7d59..eb16a00 100644
--- 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 a2a1628..3242b31 100755
--- a/products/compil_scripts/cppunit.bat
+++ b/products/compil_scripts/cppunit.bat
@@ -9,7 +9,8 @@ IF NOT DEFINED SAT_DEBUG (
 )
 
 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/freeimage.bat b/products/compil_scripts/freeimage.bat
index 74a39da..9c846ca 100644
--- 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 9577cb6..8f1ef44 100755
--- a/products/compil_scripts/freetype.bat
+++ b/products/compil_scripts/freetype.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/lapack.bat b/products/compil_scripts/lapack.bat
index 54b5680..339e321 100644
--- 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 c125dcd..bbfa6cc 100644
--- 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 f9921d8..35c6f37 100755
--- 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 96487ab..5e6fab8 100644
--- 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 96487ab..5e6fab8 100644
--- 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
 )