spns #40695: Windows - define CMAKE_GENERATOR in case it is not set in application...

diff --git a/products/KERNEL.pyconf b/products/KERNEL.pyconf
index 5455733dbb09d64af4d9c272e8bf74573990255a..637a8d81f47a8ea7d02133ff5d3f9b624189ca6d 100644 (file)
--- a/products/KERNEL.pyconf
+++ b/products/KERNEL.pyconf
@@ -47,7 +47,7 @@ default :
 
 default_win :
 {
-    cmake_options : "-DSALOME_USE_LIBBATCH=ON -DCMAKE_GENERATOR=\"Visual Studio 15 2017 Win64\" -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DCMAKE_CXX_COMPILER_ARCHITECTURE_ID=x64 -DBOOST_ROOT=%BOOST_ROOT_DIR:\=/% -DBOOST_DEBUG=ON -DBoost_ADDITIONAL_VERSIONS=\"%BOOST_VERSION% %BOOST_VERSION_MajorMinor%\" -DBOOST_INCLUDEDIR=%Boost_INCLUDE_DIR:\=/% -DBOOST_LIBRARYDIR=%BOOST_LIBRARY_DIR:\=/%b -DSALOME_USE_64BIT_IDS=ON "
+    cmake_options : "-DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DCMAKE_CXX_COMPILER_ARCHITECTURE_ID=x64 -DBOOST_ROOT=%BOOST_ROOT_DIR:\=/% -DBOOST_DEBUG=ON -DBoost_ADDITIONAL_VERSIONS=\"%BOOST_VERSION% %BOOST_VERSION_MajorMinor%\" -DBOOST_INCLUDEDIR=%Boost_INCLUDE_DIR:\=/% -DBOOST_LIBRARYDIR=%BOOST_LIBRARY_DIR:\=/%b -DSALOME_USE_64BIT_IDS=ON "
     depend : ["Python",
               "boost",
               "numpy",

diff --git a/products/LIBBATCH.pyconf b/products/LIBBATCH.pyconf
index 89da315528d90134f7ac556b42c4bad6eecb5482..70be92410246d794ae92f54a120c8d8a7e2ac328 100755 (executable)
--- a/products/LIBBATCH.pyconf
+++ b/products/LIBBATCH.pyconf
@@ -26,7 +26,7 @@ default :
 
 default_win :
 {
-    cmake_options : '-DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe'
+    cmake_options : ' -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe'
     depend : [ "Python", "pthreads" ]
 }
 
@@ -38,7 +38,7 @@ version_V2_5_0:
 
 version_V2_5_0_win:
 {
-    cmake_options : '-DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DLIBBATCH_CXX_STANDARD=17 '
+    cmake_options : '-DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DLIBBATCH_CXX_STANDARD=17 '
     properties:
     {
         incremental : 'yes'
@@ -53,7 +53,7 @@ version_V2_4_6:
 
 version_V2_4_6_win:
 {
-    cmake_options : '-DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DLIBBATCH_CXX_STANDARD=17 '
+    cmake_options : '-DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DLIBBATCH_CXX_STANDARD=17 '
     properties:
     {
         incremental : 'yes'
@@ -68,7 +68,7 @@ version_V2_4_5:
 
 version_V2_4_5_win:
 {
-    cmake_options : '-DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DLIBBATCH_CXX_STANDARD=17 '
+    cmake_options : ' -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DLIBBATCH_CXX_STANDARD=17 '
 }
 
 version_V2_4_4:
@@ -78,5 +78,5 @@ version_V2_4_4:
 
 version_V2_4_4_win:
 {
-    cmake_options : '-DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe '
+    cmake_options : '-DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe '
 }

diff --git a/products/NETGENPLUGIN.pyconf b/products/NETGENPLUGIN.pyconf
index 562b4df348dc525b11549a8768c0105fcf1a89ae..e2b33fd2e637b9c0970dad283d26e73c32e3cb92 100755 (executable)
--- a/products/NETGENPLUGIN.pyconf
+++ b/products/NETGENPLUGIN.pyconf
@@ -46,7 +46,7 @@ default :
 
 default_win :
 {
-    cmake_options : " -DZLIB_LIBRARY=%ZLIB_BIN:\=/%  -DZLIB_INCLUDE_DIR=%ZLIB_INCLUDE_DIR:\=/%  -DCMAKE_GENERATOR=\"Visual Studio 15 2017 Win64\" -DSALOME_CXX_STANDARD=17 "
+    cmake_options : " -DZLIB_LIBRARY=%ZLIB_BIN:\=/%  -DZLIB_INCLUDE_DIR=%ZLIB_INCLUDE_DIR:\=/% -DSALOME_CXX_STANDARD=17 "
     depend : [
              "KERNEL",
              "MEDCOUPLING",

diff --git a/products/compil_scripts/ADAO.bat b/products/compil_scripts/ADAO.bat
index 4b424068e240207730f696b4b6d5f75c9361ec31..729af33c2d15a5aaf8bd41885b71af6d0214c41d 100644 (file)
--- a/products/compil_scripts/ADAO.bat
+++ b/products/compil_scripts/ADAO.bat
@@ -4,6 +4,21 @@ echo ##########################################################################
 echo ADAO %VERSION%
 echo ##########################################################################
 
+IF NOT DEFINED SAT_DEBUG (
+  SET SAT_DEBUG=0
+)
+
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
+SET PRODUCT_BUILD_TYPE=release
+
+REM TODO: NGH: not Tested yet
+if %SAT_DEBUG% == 1 (
+  set PRODUCT_BUILD_TYPE=debug
+)
+
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 
 REM clean BUILD directory
@@ -23,7 +38,7 @@ 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:STRING="Visual Studio 15 2017 Win64"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 set MSBUILDDISABLENODEREUSE=1
 
@@ -76,7 +91,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:STRING="Visual Studio 15 2017 Win64"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 echo.
 echo *********************************************************************
@@ -94,7 +109,7 @@ REM set CL=/D__WIN32__ /DSIZEOF_INT=4 /DSIZEOF_LONG=4 %CL%
 
 echo.
 echo *********************************************************************
-echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj"
+echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj
 echo *********************************************************************
 echo.
 

diff --git a/products/compil_scripts/CAS_7.3.bat b/products/compil_scripts/CAS_7.3.bat
index 4621b92c43eba997d2e2d50759e46a243e6aaed3..abbce795027594096556affc6ea8b7947b233893 100644 (file)
--- a/products/compil_scripts/CAS_7.3.bat
+++ b/products/compil_scripts/CAS_7.3.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 SET PRODUCT_BUILD_TYPE=Release
 if %SAT_DEBUG% == 1 (
   set PRODUCT_BUILD_TYPE=Debug
@@ -21,7 +25,7 @@ mkdir %BUILD_DIR%
 
 cd %BUILD_DIR%
 
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR:STRING="Visual Studio 15 2017 Win64"
+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:\=/%
@@ -55,7 +59,7 @@ if NOT %ERRORLEVEL% == 0 (
 
 echo.
 echo *********************************************************************
-echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj"
+echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj
 echo *********************************************************************
 echo.
 

diff --git a/products/compil_scripts/CAS_7.4.bat b/products/compil_scripts/CAS_7.4.bat
index 71f059708ddd66f8fc73335ae786ab339c1d2b99..81087e4d057df0c9a301e1e2d7cfe31a5bb6ca6f 100644 (file)
--- a/products/compil_scripts/CAS_7.4.bat
+++ b/products/compil_scripts/CAS_7.4.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 SET PRODUCT_BUILD_TYPE=Release
 if %SAT_DEBUG% == 1 (
   set PRODUCT_BUILD_TYPE=Debug
@@ -21,7 +25,7 @@ mkdir %BUILD_DIR%
 
 cd %BUILD_DIR%
 
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR:STRING="Visual Studio 15 2017 Win64"
+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:\=/%
@@ -55,7 +59,7 @@ if NOT %ERRORLEVEL% == 0 (
 
 echo.
 echo *********************************************************************
-echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj"
+echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj
 echo *********************************************************************
 echo.
 

diff --git a/products/compil_scripts/CAS_7.5.bat b/products/compil_scripts/CAS_7.5.bat
index e1499d48c2b15cb1521888b4ff4a406684a04112..c5d8f14898643515c1f4f079be695df3845e6a71 100644 (file)
--- a/products/compil_scripts/CAS_7.5.bat
+++ b/products/compil_scripts/CAS_7.5.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 SET PRODUCT_BUILD_TYPE=Release
 if %SAT_DEBUG% == 1 (
   set PRODUCT_BUILD_TYPE=Debug
@@ -21,7 +25,7 @@ mkdir %BUILD_DIR%
 
 cd %BUILD_DIR%
 
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR:STRING="Visual Studio 15 2017 Win64"
+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:\=/%

diff --git a/products/compil_scripts/FMILibrary-2.0.3.bat b/products/compil_scripts/FMILibrary-2.0.3.bat
index 39a929945ba7dc19bb7e5ee2f607d69fcc0cc055..a804c5c596867699e81435ea332ae3622d003b14 100644 (file)
--- a/products/compil_scripts/FMILibrary-2.0.3.bat
+++ b/products/compil_scripts/FMILibrary-2.0.3.bat
@@ -8,9 +8,11 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
-SET PRODUCT_BUILD_TYPE=Release
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
 
-REM TODO: NGH: not Tested yet
+SET PRODUCT_BUILD_TYPE=Release
 if %SAT_DEBUG% == 1 (
   set PRODUCT_BUILD_TYPE=Debug
 )
@@ -26,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="Visual Studio 15 2017 Win64"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 cd %BUILD_DIR%
 

diff --git a/products/compil_scripts/HOMARD_MED_MINGW.bat b/products/compil_scripts/HOMARD_MED_MINGW.bat
index 0ccc3a9f001cd05f9d23c11a6f3bcd2147c0f1bd..f55caeb11353a3daf4fd93f250e111240cde9baa 100644 (file)
--- a/products/compil_scripts/HOMARD_MED_MINGW.bat
+++ b/products/compil_scripts/HOMARD_MED_MINGW.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 SET PRODUCT_BUILD_TYPE=Release
 if %SAT_DEBUG% == 1 (
   set PRODUCT_BUILD_TYPE=Debug
@@ -41,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:STRING="Visual Studio 15 2017 Win64"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 set MSBUILDDISABLENODEREUSE=1
 
@@ -55,7 +59,7 @@ if NOT %ERRORLEVEL% == 0 (
 
 echo.
 echo *********************************************************************
-echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj"
+echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj
 echo *********************************************************************
 echo.
 

diff --git a/products/compil_scripts/OPENTURNS_SALOME.bat b/products/compil_scripts/OPENTURNS_SALOME.bat
index a0d21b1d27f0e6910aef51f804b51659837fc094..bcc800c6898c14ac43e55deb2099f57544deb53d 100644 (file)
--- a/products/compil_scripts/OPENTURNS_SALOME.bat
+++ b/products/compil_scripts/OPENTURNS_SALOME.bat
@@ -125,7 +125,7 @@ echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%
 echo *********************************************************************
 echo.
 
-%CMAKE_ROOT%\bin\cmake -G "Visual Studio 15 2017 Win64" %CMAKE_OPTIONS% %SOURCE_DIR%
+%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %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 a0be008a9fc99a6e9d7420eb0fe9efad342df076..7202b1cee74f190f53b097b2c03468014bd179be 100644 (file)
--- a/products/compil_scripts/PERSALYS-v13.0.bat
+++ b/products/compil_scripts/PERSALYS-v13.0.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 SET PRODUCT_BUILD_TYPE=Release
 if %SAT_DEBUG% == 1 (
   set PRODUCT_BUILD_TYPE=Debug
@@ -44,14 +48,8 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DTBB_INCLUDE_DIR=%TBB_ROOT_DIR:\=/%/include
 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
-REM CMAKE_OPTIONS+=" -DSWIG_EXECUTABLE:PATH=$(which swig)"
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGNS_INCLUDE_DIR:PATH=%CGNS_ROOT_DIR:\=/%/include
-
-if defined CMAKE_GENERATOR (
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
-) else (
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"
-)
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 set MSBUILDDISABLENODEREUSE=1
 

diff --git a/products/compil_scripts/PERSALYS-v14.0.1.bat b/products/compil_scripts/PERSALYS-v14.0.1.bat
index eedaab8d470b4eb9ffba5d8649e0cea16f4d2d5f..f092391912bc42cf603bb353dde1385be013c9ee 100644 (file)
--- a/products/compil_scripts/PERSALYS-v14.0.1.bat
+++ b/products/compil_scripts/PERSALYS-v14.0.1.bat
@@ -8,15 +8,15 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 SET PRODUCT_BUILD_TYPE=Release
 if %SAT_DEBUG% == 1 (
   set PRODUCT_BUILD_TYPE=Debug
 )
 
-IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
-)
-
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 
 REM clean BUILD directory
@@ -123,7 +123,7 @@ echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%
 echo *********************************************************************
 echo.
 
-%CMAKE_ROOT%\bin\cmake -G "Visual Studio 15 2017 Win64" %CMAKE_OPTIONS% %SOURCE_DIR%
+%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %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 eedaab8d470b4eb9ffba5d8649e0cea16f4d2d5f..cd4f0aa7e5c61ebbc120e96daadb0c55b719a256 100644 (file)
--- a/products/compil_scripts/PERSALYS-v14.1.bat
+++ b/products/compil_scripts/PERSALYS-v14.1.bat
@@ -123,7 +123,7 @@ echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%
 echo *********************************************************************
 echo.
 
-%CMAKE_ROOT%\bin\cmake -G "Visual Studio 15 2017 Win64" %CMAKE_OPTIONS% %SOURCE_DIR%
+%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %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 8370ffb987de53512836beb2b48bd197bd9c64ce..ff7cd6df9c37cc3b24702b76f4da955f6f9ce96d 100644 (file)
--- a/products/compil_scripts/ParaView-5.10.0.bat
+++ b/products/compil_scripts/ParaView-5.10.0.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 REM clean BUILD directory
 if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
@@ -163,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="Visual Studio 15 2017 Win64"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 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 21c26f3e00140a33951ab7387cb1c8d215a00bc5..1f4db3212c7e40293b30233c1aba55b30a200431 100644 (file)
--- a/products/compil_scripts/ParaView-5.11.0.bat
+++ b/products/compil_scripts/ParaView-5.11.0.bat
@@ -11,6 +11,7 @@ IF NOT DEFINED SAT_DEBUG (
 IF NOT DEFINED CMAKE_GENERATOR (
   SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
 )
+
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 REM clean BUILD directory
 if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%

diff --git a/products/compil_scripts/ParaView-5.11.1.bat b/products/compil_scripts/ParaView-5.11.1.bat
index 424734c4ae1cdb293c41d1bd23bf8288991a7c71..8019a074f4ab322752ae41387ae6726f4ec0ba38 100644 (file)
--- a/products/compil_scripts/ParaView-5.11.1.bat
+++ b/products/compil_scripts/ParaView-5.11.1.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 REM clean BUILD directory
 if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
@@ -204,7 +208,7 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_PLUGIN_AUTOLOAD_VTKmFilters=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_SMP_IMPLEMENTATION_TYPE=TBB
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_SMP_ENABLE_OPENMP:BOOL=OFF -DVTK_SMP_ENABLE_STDTHREAD:BOOL=ON -DVTK_SMP_ENABLE_SEQUENTIAL:BOOL=ON
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTKm_ENABLE_TBB:BOOL=ON -DVTKm_ENABLE_OPENMP:BOOL=OFF
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 cd %BUILD_DIR%
 echo.
 echo INFO: running command: %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%

diff --git a/products/compil_scripts/ParaView-5.6.0_bfaf7b8.bat b/products/compil_scripts/ParaView-5.6.0_bfaf7b8.bat
index 0c6f911370fa213abf52fa80b4acd3bc3135202e..30cf4157c127b47401a7bf5653533158d5dc1965 100644 (file)
--- a/products/compil_scripts/ParaView-5.6.0_bfaf7b8.bat
+++ b/products/compil_scripts/ParaView-5.6.0_bfaf7b8.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 REM clean BUILD directory
 if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
@@ -151,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="Visual Studio 15 2017 Win64"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 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 8cfd0ead5d898ac69a894fc268ade365f4bffa15..23ee4a7ee803901f040d33e2c160e43f615b2a29 100644 (file)
--- a/products/compil_scripts/ParaView-5.8.0.bat
+++ b/products/compil_scripts/ParaView-5.8.0.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 REM clean BUILD directory
 if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
@@ -160,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="Visual Studio 15 2017 Win64"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 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 43096ba395f874cd8c28e1182dc90c7a8aa62dec..2ff85d1189b22e622b4dcd9879f2a9f9524ac18d 100644 (file)
--- a/products/compil_scripts/ParaView-5.9.0.bat
+++ b/products/compil_scripts/ParaView-5.9.0.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 REM clean BUILD directory
 if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
@@ -171,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="Visual Studio 15 2017 Win64"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 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 8370ffb987de53512836beb2b48bd197bd9c64ce..ff7cd6df9c37cc3b24702b76f4da955f6f9ce96d 100644 (file)
--- a/products/compil_scripts/ParaView-5.9.1.bat
+++ b/products/compil_scripts/ParaView-5.9.1.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 REM clean BUILD directory
 if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
@@ -163,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="Visual Studio 15 2017 Win64"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 cd %BUILD_DIR%
 echo.

diff --git a/products/compil_scripts/ParaView.bat b/products/compil_scripts/ParaView.bat
index d6c8b6deca5e7af41d89d4214646161af81fee35..ef40237bbcab86458cc528591f1730e2652b5d6a 100644 (file)
--- a/products/compil_scripts/ParaView.bat
+++ b/products/compil_scripts/ParaView.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 REM clean BUILD directory
 if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
@@ -146,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="Visual Studio 15 2017 Win64"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 cd %BUILD_DIR%
 echo.

diff --git a/products/compil_scripts/TTK.bat b/products/compil_scripts/TTK.bat
index fe69430d63c29966df5a1dcccd399c591aa9eba7..2225ac9857a517bfda7dd5ce379efcbc5bdccdc6 100644 (file)
--- a/products/compil_scripts/TTK.bat
+++ b/products/compil_scripts/TTK.bat
@@ -8,8 +8,11 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
-SET PRODUCT_BUILD_TYPE=Release
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
 
+SET PRODUCT_BUILD_TYPE=Release
 REM TODO: NGH: not Tested yet
 if %SAT_DEBUG% == 1 (
   set PRODUCT_BUILD_TYPE=Debug
@@ -28,7 +31,7 @@ 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="Visual Studio 15 2017 Win64"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 REM Boost settings
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_ROOT:PATH=%BOOST_ROOT_DIR:\=/%

diff --git a/products/compil_scripts/YDEFX.bat b/products/compil_scripts/YDEFX.bat
index 45c5671213f557f8e1126efb0b2d3bc5f84ffd06..60a4d11269019230132de10d4fd86fb5ba03e82d 100644 (file)
--- a/products/compil_scripts/YDEFX.bat
+++ b/products/compil_scripts/YDEFX.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 SET PRODUCT_BUILD_TYPE=Release
 
 REM TODO: NGH: not Tested yet
@@ -25,8 +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="Visual Studio 15 2017 Win64"
-
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 cd %BUILD_DIR%
 

diff --git a/products/compil_scripts/boost_V1.79.0.bat b/products/compil_scripts/boost_V1.79.0.bat
index 24f43a228d7f0e76cb8312fd10098c68823f9d1f..be32e1b9389c56f1148936f4a0fc222d2f042e03 100644 (file)
--- a/products/compil_scripts/boost_V1.79.0.bat
+++ b/products/compil_scripts/boost_V1.79.0.bat
@@ -13,8 +13,6 @@ IF NOT DEFINED CMAKE_GENERATOR (
 )
 
 SET PRODUCT_BUILD_TYPE=release
-
-REM TODO: NGH: not Tested yet
 if %SAT_DEBUG% == 1 (
   set PRODUCT_BUILD_TYPE=debug
 )

diff --git a/products/compil_scripts/bsd_xdr.bat b/products/compil_scripts/bsd_xdr.bat
index b81918a1e50dc6473854316ec94a77e83b78ee36..1c03ee8bc343ace414f4aeda9eb87eefc927954d 100755 (executable)
--- a/products/compil_scripts/bsd_xdr.bat
+++ b/products/compil_scripts/bsd_xdr.bat
@@ -4,15 +4,25 @@ echo ##########################################################################
 echo bsd-xdr $VERSION
 echo ##########################################################################
 
+IF NOT DEFINED SAT_DEBUG (
+  SET SAT_DEBUG=0
+)
+
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
+SET PRODUCT_BUILD_TYPE=release
+
+if %SAT_DEBUG% == 1 (
+  set PRODUCT_BUILD_TYPE=debug
+)
+
 if exist "%PRODUCT_INSTALL%" rmdir /Q /S "%PRODUCT_INSTALL%"
 mkdir %PRODUCT_INSTALL%
 
 set CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%
-if defined CMAKE_GENERATOR (
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
-) else (
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 10 2010 Win64"
-)
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 set MSBUILDDISABLENODEREUSE=1
 

diff --git a/products/compil_scripts/cgns.bat b/products/compil_scripts/cgns.bat
index d7994cb79789b95dec4d34e2914f6eec9897fc23..354844ba13c2d39724537b5ebd2e1807fd0dd920 100755 (executable)
--- a/products/compil_scripts/cgns.bat
+++ b/products/compil_scripts/cgns.bat
@@ -8,9 +8,11 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
-SET PRODUCT_BUILD_TYPE=Release
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
 
-REM TODO: NGH: not Tested yet
+SET PRODUCT_BUILD_TYPE=Release
 if %SAT_DEBUG% == 1 (
   set PRODUCT_BUILD_TYPE=Debug
 )
@@ -37,8 +39,7 @@ if "%VERSION%" == "4.2.0" (
     SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGNS_ENABLE_64BIT:BOOL=OFF
 )
 
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"
-
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 cd %BUILD_DIR%
 

diff --git a/products/compil_scripts/cmake.bat b/products/compil_scripts/cmake.bat
index f6d11815d2a5ca351e39f41856733c088df4854f..8f4ef554d66ed5a7cf7c255f4eb95f546dfb329d 100644 (file)
--- a/products/compil_scripts/cmake.bat
+++ b/products/compil_scripts/cmake.bat
@@ -4,6 +4,11 @@ echo ##########################################################################
 echo cmake %VERSION%
 echo ##########################################################################
 
+
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 
 REM clean BUILD directory

diff --git a/products/compil_scripts/cminpack-1.3.6.bat b/products/compil_scripts/cminpack-1.3.6.bat
index a4195a99630f764dc8df97aebe722e1764c26e9f..1508c269287a47ed11eb3af9bc0367a60c138382 100644 (file)
--- a/products/compil_scripts/cminpack-1.3.6.bat
+++ b/products/compil_scripts/cminpack-1.3.6.bat
@@ -8,9 +8,11 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
-SET PRODUCT_BUILD_TYPE=Release
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
 
-REM TODO: NGH: not Tested yet
+SET PRODUCT_BUILD_TYPE=Release
 if %SAT_DEBUG% == 1 (
   set PRODUCT_BUILD_TYPE=Debug
 )
@@ -25,9 +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:\=/%
-REM set CMAKE_OPT
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"
-
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 cd %BUILD_DIR%
 

diff --git a/products/compil_scripts/eigen.bat b/products/compil_scripts/eigen.bat
index bcba481397d06df226b59cb2aba17063278cd1f0..742558d5c01cb587161ca73c6715d2606e83133f 100644 (file)
--- a/products/compil_scripts/eigen.bat
+++ b/products/compil_scripts/eigen.bat
@@ -8,8 +8,11 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 SET PRODUCT_BUILD_TYPE=Release
-REM TODO: NGH: not Tested yet
 if %SAT_DEBUG% == 1 (
   set PRODUCT_BUILD_TYPE=Debug
 )
@@ -21,12 +24,10 @@ mkdir %BUILD_DIR%
 
 cd %BUILD_DIR%
 
-REM Install 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="Visual Studio 15 2017 Win64"
-
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 echo.
 echo *********************************************************************
@@ -42,7 +43,7 @@ if NOT %ERRORLEVEL% == 0 (
 
 echo.
 echo *********************************************************************
-echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj"
+echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj
 echo *********************************************************************
 echo.
 

diff --git a/products/compil_scripts/fftw-3.3.9.bat b/products/compil_scripts/fftw-3.3.9.bat
index 3e306f46d6184a14bdb8266cf9b9179b49df233b..ee1edcbda61eb0a1b4e034dea46fb8de9f4e359a 100644 (file)
--- a/products/compil_scripts/fftw-3.3.9.bat
+++ b/products/compil_scripts/fftw-3.3.9.bat
@@ -8,15 +8,15 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
-SET PRODUCT_BUILD_TYPE=Release
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
 
-REM TODO: NGH: not Tested yet
+SET PRODUCT_BUILD_TYPE=Release
 if %SAT_DEBUG% == 1 (
   set PRODUCT_BUILD_TYPE=Debug
 )
-IF NOT DEFINED CMAKE_GENERATOR (
-  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
-)
+
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 set INCLUDE=
 REM clean BUILD directory

diff --git a/products/compil_scripts/gl2ps.bat b/products/compil_scripts/gl2ps.bat
index c4cbe56c5a33605e1328da0de24e999711a0dc92..05438dbf31ce4356cbd9de7841823a8793feb17b 100755 (executable)
--- a/products/compil_scripts/gl2ps.bat
+++ b/products/compil_scripts/gl2ps.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 SET PRODUCT_BUILD_TYPE=Release
 REM TODO: NGH: not Tested yet
 REM if %SAT_DEBUG% == 1 (
@@ -25,12 +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
-
-if defined CMAKE_GENERATOR (
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
-) else (
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"
-)
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 set MSBUILDDISABLENODEREUSE=1
 

diff --git a/products/compil_scripts/gmsh-4.10.3.bat b/products/compil_scripts/gmsh-4.10.3.bat
index b02b880435bb1cb2da5477d256160ca1e1097f07..d00f196f4c72379cb0b01497827763eea82413bb 100644 (file)
--- a/products/compil_scripts/gmsh-4.10.3.bat
+++ b/products/compil_scripts/gmsh-4.10.3.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 SET PRODUCT_BUILD_TYPE=Release
 SET BUILD_SHARED=ON
 if %SAT_DEBUG% == 1 (
@@ -39,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="Visual Studio 15 2017 Win64"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR:STRING=%CMAKE_GENERATOR%
 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 2fbabf65170f83c63bd415f34b2566a04bd940ca..889044e36f4595072fc7312dc3c6227dc35402a4 100644 (file)
--- a/products/compil_scripts/gmsh-4.8.4.bat
+++ b/products/compil_scripts/gmsh-4.8.4.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 SET PRODUCT_BUILD_TYPE=Release
 SET BUILD_SHARED=ON
 if %SAT_DEBUG% == 1 (
@@ -38,7 +42,7 @@ 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:STRING="Visual Studio 15 2017 Win64"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 set MSBUILDDISABLENODEREUSE=1
 
 echo.

diff --git a/products/compil_scripts/gmsh.bat b/products/compil_scripts/gmsh.bat
index d277401e275389f46d75bddabb586306a54418b9..c1aea9f017e8b17b6866b6e057c048cb274b274e 100644 (file)
--- a/products/compil_scripts/gmsh.bat
+++ b/products/compil_scripts/gmsh.bat
@@ -4,6 +4,20 @@ echo ##########################################################################
 echo gmsh %VERSION%
 echo ##########################################################################
 
+IF NOT DEFINED SAT_DEBUG (
+  SET SAT_DEBUG=0
+)
+
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
+SET PRODUCT_BUILD_TYPE=Release
+SET BUILD_SHARED=ON
+if %SAT_DEBUG% == 1 (
+  set PRODUCT_BUILD_TYPE=Debug
+  set BUILD_SHARED=OFF
+)
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 if NOT exist "%PRODUCT_INSTALL%\include" mkdir %PRODUCT_INSTALL%\include
@@ -13,13 +27,12 @@ REM clean BUILD directory
 if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
 mkdir %BUILD_DIR%
 
-REM SET BLAS_LAPACK_LIBRARIES="%LAPACK_ROOT_DIR%\lib\libblas.dll.a;%LAPACK_ROOT_DIR%\lib\libcblas.dll.a;%LAPACK_ROOT_DIR%\lib\liblapack.dll.a;%LAPACK_ROOT_DIR%\lib\liblapacke.dll.a"
 cd %BUILD_DIR%
 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% -DCMAKE_BUILD_TYPE=%PRODUCT_BUILD_TYPE%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_BUILD_LIB=ON
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_BUILD_SHARED=ON
-set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_BUILD_DYNAMIC=ON
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_BUILD_SHARED=%BUILD_SHARED%
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_BUILD_DYNAMIC=%BUILD_SHARED%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_ACIS=OFF 
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_FLTK=OFF
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_ONELAB_METAMODEL=OFF
@@ -30,9 +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:STRING="Visual Studio 15 2017 Win64"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DENABLE_BLAS_LAPACK=OFF
-REM Set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBLAS_LAPACK_LIBRARIES:STRING=%BLAS_LAPACK_LIBRARIES%
 set MSBUILDDISABLENODEREUSE=1
 
 echo.
@@ -112,4 +124,4 @@ REM these two files need to be moved to bin, adding bin directory to PATH does n
 cp %PRODUCT_INSTALL%\lib\gmsh.py %PRODUCT_INSTALL%\bin\gmsh.py
 cp %PRODUCT_INSTALL%\lib\gmsh.dll %PRODUCT_INSTALL%\bin\gmsh.dll
 echo.
-echo ########## END
\ No newline at end of file
+echo ########## END

diff --git a/products/compil_scripts/graphviz-2.44.1.bat b/products/compil_scripts/graphviz-2.44.1.bat
index 7ca56949d4d926649def7af8814551dc9f3e3653..d8c585def1923039d4ebed4cf328095b94d08053 100644 (file)
--- a/products/compil_scripts/graphviz-2.44.1.bat
+++ b/products/compil_scripts/graphviz-2.44.1.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 SET PRODUCT_BUILD_TYPE=Release
 REM TODO: NGH: not Tested yet
 if %SAT_DEBUG% == 1 (
@@ -27,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="Visual Studio 15 2017 Win64"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 set MSBUILDDISABLENODEREUSE=1
 
@@ -45,7 +49,7 @@ if NOT %ERRORLEVEL% == 0 (
 
 echo.
 echo *********************************************************************
-echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj"
+echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj
 echo *********************************************************************
 echo.
 msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj

diff --git a/products/compil_scripts/graphviz.bat b/products/compil_scripts/graphviz.bat
index 9140cfa8d241e706ed3248408c752bffa61e24b0..fa5e15e8516ef8e67dbdc16725c9551dfbd82b0d 100644 (file)
--- a/products/compil_scripts/graphviz.bat
+++ b/products/compil_scripts/graphviz.bat
@@ -7,6 +7,11 @@ echo ##########################################################################
 IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
+
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 SET PRODUCT_BUILD_TYPE=Release
 REM TODO: NGH: not Tested yet
 REM if %SAT_DEBUG% == 1 (
@@ -18,9 +23,49 @@ if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
 mkdir %BUILD_DIR%
 
 cd %BUILD_DIR%
-cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% %SOURCE_DIR%
-msbuild ALL_BUILD.vcxproj /p:Configuration=%PRODUCT_BUILD_TYPE%
-msbuild INSTALL.vcxproj /p:Configuration=%PRODUCT_BUILD_TYPE%
+
+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 MSBUILDDISABLENODEREUSE=1
+
+echo.
+echo *********************************************************************
+echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%
+echo *********************************************************************
+echo.
+
+%CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%
+if NOT %ERRORLEVEL% == 0 (
+    echo "ERROR on cmake"
+    exit 1
+)
+
+echo.
+echo *********************************************************************
+echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj
+echo *********************************************************************
+echo.
+msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj
+if NOT %ERRORLEVEL% == 0 (
+    echo ERROR on msbuild ALL_BUILD.vcxproj
+    exit 2
+)
+
+echo.
+echo *********************************************************************
+echo *** installation...
+echo *********************************************************************
+echo.
+msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 INSTALL.vcxproj
+if NOT %ERRORLEVEL% == 0 (
+    echo ERROR on msbuild INSTALL.vcxproj
+    exit 3
+)
+
+taskkill /F /IM "mspdbsrv.exe"
 echo.
 echo ########## END
 

diff --git a/products/compil_scripts/hdf5CMake.bat b/products/compil_scripts/hdf5CMake.bat
index e413b19841b3ea442f66422e9a51a2a52d2d701d..904a4aefc82f3c29a3afa890245fc8b6b83abd3b 100755 (executable)
--- a/products/compil_scripts/hdf5CMake.bat
+++ b/products/compil_scripts/hdf5CMake.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0\r
 )\r
 \r
+IF NOT DEFINED CMAKE_GENERATOR (\r
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
+)\r
+\r
 SET PRODUCT_BUILD_TYPE=Release\r
 if %SAT_DEBUG% == 1 (\r
   set PRODUCT_BUILD_TYPE=Debug\r
@@ -28,18 +32,13 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DALLOW_UNSUPPORTED:BOOL=ON
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_BUILD_TOOLS:BOOL=ON  \r
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_BUILD_HL_LIB:BOOL=ON\r
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_BUILD_CPP_LIB:BOOL=ON\r
-\r
 if DEFINED SAT_HPC (\r
     SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_ENABLE_PARALLEL:BOOL=ON\r
     SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMPI_LINK_FLAGS:STRING=-Wl\r
 ) else (\r
     SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_ENABLE_PARALLEL:BOOL=OFF\r
 )\r
-if defined CMAKE_GENERATOR (\r
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
-) else (\r
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
-)\r
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
 \r
 set MSBUILDDISABLENODEREUSE=1\r
 \r

diff --git a/products/compil_scripts/ispc.bat b/products/compil_scripts/ispc.bat
index ec54df729c279d2744d68f1e52d70fbe33f5f613..dac40fa41df503d2e0efafcf0add180e50e7c4b3 100644 (file)
--- a/products/compil_scripts/ispc.bat
+++ b/products/compil_scripts/ispc.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 SET PRODUCT_BUILD_TYPE=Release
 REM Building ISPC in DEBUG mode is definitely not relevant.
 REM if %SAT_DEBUG% == 1 (
@@ -33,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="Visual Studio 15 2017 Win64"
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 cd %BUILD_DIR%
 

diff --git a/products/compil_scripts/lata.bat b/products/compil_scripts/lata.bat
index fb232af2de9c6202b35adaba3addf50279b01cb9..db0f2c2c3c158241f1f20f0e0f0ba1d851fd72df 100644 (file)
--- a/products/compil_scripts/lata.bat
+++ b/products/compil_scripts/lata.bat
@@ -4,6 +4,9 @@ echo ##########################################################################
 echo Installing LATA %VERSION%
 echo ##########################################################################
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
 
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%
 if NOT exist "%PRODUCT_INSTALL%\lib" mkdir %PRODUCT_INSTALL%\lib
@@ -53,7 +56,7 @@ 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="Visual Studio 15 2017 Win64"
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVisItBridgePlugin_SOURCE_DIR=%BUILD_DIR:\=/%/VisItLib 
 cmake %CMAKE_OPTIONS%
 if NOT %ERRORLEVEL% == 0 (
@@ -90,4 +93,4 @@ if NOT %ERRORLEVEL% == 0 (
 taskkill /F /IM "mspdbsrv.exe"
 
 echo.
-echo ########## END
\ No newline at end of file
+echo ########## END

diff --git a/products/compil_scripts/libpng.bat b/products/compil_scripts/libpng.bat
index 2d254ee70dc87381d1f0f58f4677b6e702ad18f4..be17e7790506ad5bf318ad2083675a8e8112ed4c 100755 (executable)
--- a/products/compil_scripts/libpng.bat
+++ b/products/compil_scripts/libpng.bat
@@ -35,50 +35,3 @@ if NOT %ERRORLEVEL% == 0 (
 \r
 echo.\r
 echo ########## END\r
-\r
-REM if exist "%PRODUCT_INSTALL%" rmdir /Q /S "%PRODUCT_INSTALL%"\r
-REM mkdir %PRODUCT_INSTALL%\r
-\r
-REM set CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%\r
-REM if defined CMAKE_GENERATOR (\r
-    REM set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
-REM ) else (\r
-    REM set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
-REM )\r
-\r
-REM set MSBUILDDISABLENODEREUSE=1\r
-\r
-REM cd %BUILD_DIR%\r
-\r
-REM echo.\r
-REM echo --------------------------------------------------------------------------\r
-REM echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS%\r
-REM echo --------------------------------------------------------------------------\r
-\r
-REM %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%\r
-REM if NOT %ERRORLEVEL% == 0 (\r
-    REM echo "ERROR on cmake"\r
-    REM exit 1\r
-REM )\r
-\r
-REM echo.\r
-REM echo --------------------------------------------------------------------------\r
-REM echo *** cmake --build . --config Release --target INSTALL\r
-REM echo --------------------------------------------------------------------------\r
-\r
-REM %CMAKE_ROOT%\bin\cmake --build . --config Release --target INSTALL\r
-REM if NOT %ERRORLEVEL% == 0 (\r
-    REM echo "ERROR on cmake build"\r
-    REM exit 2\r
-REM )\r
-\r
-REM cp %PRODUCT_INSTALL%\lib\libpng15.lib %PRODUCT_INSTALL%\lib\libpng.lib\r
-REM if NOT %ERRORLEVEL% == 0 (\r
-    REM echo "ERROR on copy libpng15.lib"\r
-    REM exit 3\r
-REM )\r
-\r
-REM taskkill /F /IM "mspdbsrv.exe"\r
-\r
-REM echo.\r
-REM echo ########## END\r

diff --git a/products/compil_scripts/llvm-8.0.1.bat b/products/compil_scripts/llvm-8.0.1.bat
index c0fbc05493377896eb9315f0d8b847f1645fb65a..5ebb2c94771802b01c9450a4834f6e086581f69a 100644 (file)
--- a/products/compil_scripts/llvm-8.0.1.bat
+++ b/products/compil_scripts/llvm-8.0.1.bat
@@ -4,6 +4,10 @@ echo ##########################################################################
 echo llvm %VERSION%
 echo ##########################################################################
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 REM NGH: no need to build this in debug mode
 SET PRODUCT_BUILD_TYPE=Release
 
@@ -21,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:STRING="Visual Studio 15 2017 Win64"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 set MSBUILDDISABLENODEREUSE=1
 
 echo.

diff --git a/products/compil_scripts/medCMake.bat b/products/compil_scripts/medCMake.bat
index 79a6b94f2d60ae7187595f9019df38b34ad43c39..883450fddde5f8f2c702e70918db7f7321f1d372 100755 (executable)
--- a/products/compil_scripts/medCMake.bat
+++ b/products/compil_scripts/medCMake.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0\r
 )\r
 \r
+IF NOT DEFINED CMAKE_GENERATOR (\r
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
+)\r
+\r
 SET PRODUCT_BUILD_TYPE=Release\r
 if %SAT_DEBUG% == 1 (\r
   set PRODUCT_BUILD_TYPE=Debug\r
@@ -35,11 +39,7 @@ if DEFINED SAT_HPC (
     SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_USE_MPI:BOOL=OFF\r
 )\r
 \r
-if defined CMAKE_GENERATOR (\r
-    SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
-) else (\r
-    SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
-)\r
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\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 aef02232a9fd51abe0f878179fcb260bd62e4115..cc71344796a9486cc046f9996880bd448c753eb8 100755 (executable)
--- a/products/compil_scripts/metis-5.1.0.bat
+++ b/products/compil_scripts/metis-5.1.0.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0\r
 )\r
 \r
+IF NOT DEFINED CMAKE_GENERATOR (\r
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
+)\r
+\r
 SET PRODUCT_BUILD_TYPE=Release\r
 REM TODO: NGH: not Tested yet\r
 REM if %SAT_DEBUG% == 1 (\r
@@ -25,7 +29,7 @@ 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="Visual Studio 15 2017 Win64"\r
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%\r
 \r
 set MSBUILDDISABLENODEREUSE=1\r

diff --git a/products/compil_scripts/netgen-6.2.2101.bat b/products/compil_scripts/netgen-6.2.2101.bat
index 06e97bfcbab86053ebef050efea25134063272ee..5abd8a5d771e2ec2c9897050b0a986f9fa913659 100644 (file)
--- a/products/compil_scripts/netgen-6.2.2101.bat
+++ b/products/compil_scripts/netgen-6.2.2101.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 SET PRODUCT_BUILD_TYPE=Release
 if %SAT_DEBUG% == 1 (
   set PRODUCT_BUILD_TYPE=Debug
@@ -94,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="Visual Studio 15 2017 Win64"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 set MSBUILDDISABLENODEREUSE=1
 

diff --git a/products/compil_scripts/netgen.bat b/products/compil_scripts/netgen.bat
index e41b90147cee4ba46e7c0503a64c2a9de525e95a..3054ea8addc365a689879377912d5f5a301c508c 100644 (file)
--- a/products/compil_scripts/netgen.bat
+++ b/products/compil_scripts/netgen.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 SET PRODUCT_BUILD_TYPE=Release
 if %SAT_DEBUG% == 1 (
   set PRODUCT_BUILD_TYPE=Debug
@@ -26,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="Visual Studio 15 2017 Win64"
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 set MSBUILDDISABLENODEREUSE=1
 

diff --git a/products/compil_scripts/netgen_5_3_1.bat b/products/compil_scripts/netgen_5_3_1.bat
index 818c73ea0638d5af9b50b61c53b2f0a5ab203d88..e0a1011e1f5ddc8744b62f86bd805e390565a024 100755 (executable)
--- a/products/compil_scripts/netgen_5_3_1.bat
+++ b/products/compil_scripts/netgen_5_3_1.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0\r
 )\r
 \r
+IF NOT DEFINED CMAKE_GENERATOR (\r
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
+)\r
+\r
 SET PRODUCT_BUILD_TYPE=Release\r
 REM TODO: NGH: not Tested yet\r
 REM if %SAT_DEBUG% == 1 (\r
@@ -29,11 +33,7 @@ dos2unix -q %SOURCE_DIR%/libsrc/occ/*
 dos2unix -q %SOURCE_DIR%/libsrc/nglib/*\r
 \r
 set CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%\r
-if defined CMAKE_GENERATOR (\r
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
-) else (\r
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
-)\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

diff --git a/products/compil_scripts/openVKL-0.11.0.bat b/products/compil_scripts/openVKL-0.11.0.bat
index e26f98650c04425d5fe6dce0037e9c7cf9026e90..e29f1c040d9fb3b7e071c2ec94d75599d7853117 100644 (file)
--- a/products/compil_scripts/openVKL-0.11.0.bat
+++ b/products/compil_scripts/openVKL-0.11.0.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 SET PRODUCT_BUILD_TYPE=Release
 REM Building openVKL in DEBUG mode is definitely not relevant.
 if %SAT_DEBUG% == 1 (
@@ -19,7 +23,6 @@ REM clean BUILD directory
 if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR%
 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%
@@ -35,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="Visual Studio 15 2017 Win64"
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 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 02351163155a3290f1e99dc100784ef19577aea8..a7251c6474eef9acf6178d00db230a59d60fc45e 100644 (file)
--- a/products/compil_scripts/openblas-0.3.23.bat
+++ b/products/compil_scripts/openblas-0.3.23.bat
@@ -8,8 +8,11 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
-SET PRODUCT_BUILD_TYPE=Release
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
 
+SET PRODUCT_BUILD_TYPE=Release
 REM TODO: NGH: not Tested yet
 if %SAT_DEBUG% == 1 (
   set PRODUCT_BUILD_TYPE=Debug
@@ -24,8 +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="Visual Studio 15 2017 Win64"
-
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 cd %BUILD_DIR%
 

diff --git a/products/compil_scripts/opencv.bat b/products/compil_scripts/opencv.bat
index 6ac2155c8ed0b716ff37966d9483f5f9bb804945..36809210a3dfa44c7f0091b6174bfa3bfc41f95d 100755 (executable)
--- a/products/compil_scripts/opencv.bat
+++ b/products/compil_scripts/opencv.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0\r
 )\r
 \r
+IF NOT DEFINED CMAKE_GENERATOR (\r
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
+)\r
+\r
 SET PRODUCT_BUILD_TYPE=Release\r
 REM TODO: NGH: not Tested yet\r
 if %SAT_DEBUG% == 1 (\r
@@ -34,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="Visual Studio 15 2017 Win64"\r
+SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
 \r
 cd %BUILD_DIR%\r
 \r

diff --git a/products/compil_scripts/openturns.bat b/products/compil_scripts/openturns.bat
index ea2eca68ffd9e6de3d13d40d7dce0aff483fbebf..5c800ee2c7c027725269726bbc462447cd8db7c9 100644 (file)
--- a/products/compil_scripts/openturns.bat
+++ b/products/compil_scripts/openturns.bat
@@ -25,7 +25,6 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE%
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_EXECUTABLE=%PYTHON_ROOT_DIR:\=/%/python.exe
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLAPACK_LIBRARIES=%LAPACK_ROOT_DIR:\=/%/lib/liblapack.dll
 SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBLAS_LIBRARIES=%LAPACK_ROOT_DIR:\=/%/lib/libblas.dll
-REM SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_SIZEOF_VOID_P=8
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_Fortran_COMPILER=%MINGW_ROOT_DIR:\=/%/bin/gfortran.exe
 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_EXE_LINKER_FLAGS="-Wl,--allow-multiple-definition"

diff --git a/products/compil_scripts/planegcs.bat b/products/compil_scripts/planegcs.bat
index aac53bcb01e648a94c231867b8da4b3de21386bb..62319c2e2132e9c52c9d47bc71f7dbebbaae2803 100644 (file)
--- a/products/compil_scripts/planegcs.bat
+++ b/products/compil_scripts/planegcs.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 SET PRODUCT_BUILD_TYPE=Release
 REM TODO: NGH: not Tested yet
 REM if %SAT_DEBUG% == 1 (
@@ -29,12 +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:\=/%
-
-if defined CMAKE_GENERATOR (
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
-) else (
-    set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"
-)
+set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%
 
 set MSBUILDDISABLENODEREUSE=1
 

diff --git a/products/compil_scripts/zlib-1.2.11.bat b/products/compil_scripts/zlib-1.2.11.bat
index 5e6fab8a118c85b84436e5f9c74eb4fb06fa8790..fae67e024947b80233421cf27690d0b0a86be2db 100644 (file)
--- a/products/compil_scripts/zlib-1.2.11.bat
+++ b/products/compil_scripts/zlib-1.2.11.bat
@@ -8,6 +8,10 @@ IF NOT DEFINED SAT_DEBUG (
   SET SAT_DEBUG=0
 )
 
+IF NOT DEFINED CMAKE_GENERATOR (
+  SET CMAKE_GENERATOR="Visual Studio 15 2017 Win64"
+)
+
 SET PRODUCT_BUILD_TYPE=Release
 if %SAT_DEBUG% == 1 (
   set PRODUCT_BUILD_TYPE=Debug
@@ -48,7 +52,7 @@ if NOT %ERRORLEVEL% == 0 (
 
 echo.
 echo *********************************************************************
-echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=%PLATFORM_TARGET% ALL_BUILD.vcxproj"
+echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=%PLATFORM_TARGET% ALL_BUILD.vcxproj
 echo *********************************************************************
 echo.
 

diff --git a/products/compil_scripts/zlib.bat b/products/compil_scripts/zlib.bat
index db7b53878b1984f68016f2a3cbbd4959715300db..552bec2dfc3af8a358090c5bc250a93f4c6caeaf 100755 (executable)
--- a/products/compil_scripts/zlib.bat
+++ b/products/compil_scripts/zlib.bat
@@ -1,7 +1,7 @@
 @echo off\r
 \r
 echo ##########################################################################\r
-echo zlib %VERSION%\r
+echo zlib (binary) %VERSION%\r
 echo ##########################################################################\r
 \r
 if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL%\r
@@ -26,47 +26,3 @@ if NOT %ERRORLEVEL% == 0 (
 \r
 echo.\r
 echo ########## END\r
-\r
-REM if exist "%PRODUCT_INSTALL%" rmdir /Q /S "%PRODUCT_INSTALL%"\r
-REM mkdir %PRODUCT_INSTALL%\r
-\r
-REM set CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/%\r
-REM if defined CMAKE_GENERATOR (\r
-    REM set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR%\r
-REM ) else (\r
-    REM set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64"\r
-REM )\r
-REM set MSBUILDDISABLENODEREUSE=1\r
-\r
-REM cd %BUILD_DIR%\r
-\r
-REM echo.\r
-REM echo --------------------------------------------------------------------------\r
-REM echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%\r
-REM echo --------------------------------------------------------------------------\r
-\r
-REM %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%\r
-REM if NOT %ERRORLEVEL% == 0 (\r
-    REM echo ERROR on cmake\r
-    REM exit 1\r
-REM )\r
-\r
-REM echo.\r
-REM echo --------------------------------------------------------------------------\r
-REM echo *** %CMAKE_ROOT%\bin\cmake --build . --config Release --target INSTALL\r
-REM echo --------------------------------------------------------------------------\r
-\r
-REM %CMAKE_ROOT%\bin\cmake --build . --config Release --target INSTALL\r
-REM if NOT %ERRORLEVEL% == 0 (\r
-    REM echo ERROR on cmake build\r
-    REM exit 2\r
-REM )\r
-\r
-REM cp %PRODUCT_INSTALL%\lib\zlib.lib %PRODUCT_INSTALL%\lib\zlib1.lib\r
-REM cp %PRODUCT_INSTALL%\lib\zlib.lib %PRODUCT_INSTALL%\lib\z.lib\r
-REM cp %PRODUCT_INSTALL%\bin\zlib.dll %PRODUCT_INSTALL%\bin\zlib1.dll\r
-\r
-REM taskkill /F /IM "mspdbsrv.exe"\r
-\r
-REM echo.\r
-REM echo ########## END
\ No newline at end of file