From 20e2fec553181781093aab3bbd4c1a4c880b30e2 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Wed, 21 Feb 2024 16:12:56 +0100 Subject: [PATCH] spns #40695: Windows - define CMAKE_GENERATOR in case it is not set in application configuration file --- products/KERNEL.pyconf | 2 +- products/LIBBATCH.pyconf | 10 ++-- products/NETGENPLUGIN.pyconf | 2 +- products/compil_scripts/ADAO.bat | 21 ++++++-- products/compil_scripts/CAS_7.3.bat | 8 ++- products/compil_scripts/CAS_7.4.bat | 8 ++- products/compil_scripts/CAS_7.5.bat | 6 ++- products/compil_scripts/FMILibrary-2.0.3.bat | 8 +-- products/compil_scripts/HOMARD_MED_MINGW.bat | 8 ++- products/compil_scripts/OPENTURNS_SALOME.bat | 2 +- products/compil_scripts/PERSALYS-v13.0.bat | 12 ++--- products/compil_scripts/PERSALYS-v14.0.1.bat | 10 ++-- products/compil_scripts/PERSALYS-v14.1.bat | 2 +- products/compil_scripts/ParaView-5.10.0.bat | 6 ++- products/compil_scripts/ParaView-5.11.0.bat | 1 + products/compil_scripts/ParaView-5.11.1.bat | 6 ++- .../compil_scripts/ParaView-5.6.0_bfaf7b8.bat | 6 ++- products/compil_scripts/ParaView-5.8.0.bat | 6 ++- products/compil_scripts/ParaView-5.9.0.bat | 6 ++- products/compil_scripts/ParaView-5.9.1.bat | 6 ++- products/compil_scripts/ParaView.bat | 6 ++- products/compil_scripts/TTK.bat | 7 ++- products/compil_scripts/YDEFX.bat | 7 ++- products/compil_scripts/boost_V1.79.0.bat | 2 - products/compil_scripts/bsd_xdr.bat | 20 ++++++-- products/compil_scripts/cgns.bat | 9 ++-- products/compil_scripts/cmake.bat | 5 ++ products/compil_scripts/cminpack-1.3.6.bat | 10 ++-- products/compil_scripts/eigen.bat | 11 ++-- products/compil_scripts/fftw-3.3.9.bat | 10 ++-- products/compil_scripts/gl2ps.bat | 11 ++-- products/compil_scripts/gmsh-4.10.3.bat | 6 ++- products/compil_scripts/gmsh-4.8.4.bat | 6 ++- products/compil_scripts/gmsh.bat | 26 +++++++--- products/compil_scripts/graphviz-2.44.1.bat | 8 ++- products/compil_scripts/graphviz.bat | 51 +++++++++++++++++-- products/compil_scripts/hdf5CMake.bat | 11 ++-- products/compil_scripts/ispc.bat | 6 ++- products/compil_scripts/lata.bat | 7 ++- products/compil_scripts/libpng.bat | 47 ----------------- products/compil_scripts/llvm-8.0.1.bat | 6 ++- products/compil_scripts/medCMake.bat | 10 ++-- products/compil_scripts/metis-5.1.0.bat | 6 ++- products/compil_scripts/netgen-6.2.2101.bat | 6 ++- products/compil_scripts/netgen.bat | 6 ++- products/compil_scripts/netgen_5_3_1.bat | 10 ++-- products/compil_scripts/openVKL-0.11.0.bat | 7 ++- products/compil_scripts/openblas-0.3.23.bat | 8 +-- products/compil_scripts/opencv.bat | 6 ++- products/compil_scripts/openturns.bat | 1 - products/compil_scripts/planegcs.bat | 11 ++-- products/compil_scripts/zlib-1.2.11.bat | 6 ++- products/compil_scripts/zlib.bat | 46 +---------------- 53 files changed, 311 insertions(+), 220 deletions(-) diff --git a/products/KERNEL.pyconf b/products/KERNEL.pyconf index 5455733..637a8d8 100644 --- 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 89da315..70be924 100755 --- 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 562b4df..e2b33fd 100755 --- 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 4b42406..729af33 100644 --- 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 4621b92..abbce79 100644 --- 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 71f0597..81087e4 100644 --- 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 e1499d4..c5d8f14 100644 --- 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 39a9299..a804c5c 100644 --- 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 0ccc3a9..f55caeb 100644 --- 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 a0d21b1..bcc800c 100644 --- 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 a0be008..7202b1c 100644 --- 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 eedaab8..f092391 100644 --- 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 eedaab8..cd4f0aa 100644 --- 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 8370ffb..ff7cd6d 100644 --- 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 21c26f3..1f4db32 100644 --- 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 424734c..8019a07 100644 --- 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 0c6f911..30cf415 100644 --- 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 8cfd0ea..23ee4a7 100644 --- 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 43096ba..2ff85d1 100644 --- 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 8370ffb..ff7cd6d 100644 --- 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 d6c8b6d..ef40237 100644 --- 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 fe69430..2225ac9 100644 --- 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 45c5671..60a4d11 100644 --- 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 24f43a2..be32e1b 100644 --- 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 b81918a..1c03ee8 100755 --- 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 d7994cb..354844b 100755 --- 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 f6d1181..8f4ef55 100644 --- 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 a4195a9..1508c26 100644 --- 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 bcba481..742558d 100644 --- 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 3e306f4..ee1edcb 100644 --- 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 c4cbe56..05438db 100755 --- 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 b02b880..d00f196 100644 --- 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 2fbabf6..889044e 100644 --- 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 d277401..c1aea9f 100644 --- 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 7ca5694..d8c585d 100644 --- 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 9140cfa..fa5e15e 100644 --- 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 e413b19..904a4ae 100755 --- 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 ) +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 @@ -28,18 +32,13 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DALLOW_UNSUPPORTED:BOOL=ON SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_BUILD_TOOLS:BOOL=ON SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_BUILD_HL_LIB:BOOL=ON SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_BUILD_CPP_LIB:BOOL=ON - if DEFINED SAT_HPC ( SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_ENABLE_PARALLEL:BOOL=ON SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMPI_LINK_FLAGS:STRING=-Wl ) else ( SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_ENABLE_PARALLEL:BOOL=OFF ) -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/ispc.bat b/products/compil_scripts/ispc.bat index ec54df7..dac40fa 100644 --- 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 fb232af..db0f2c2 100644 --- 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 2d254ee..be17e77 100755 --- a/products/compil_scripts/libpng.bat +++ b/products/compil_scripts/libpng.bat @@ -35,50 +35,3 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo ########## END - -REM if exist "%PRODUCT_INSTALL%" rmdir /Q /S "%PRODUCT_INSTALL%" -REM mkdir %PRODUCT_INSTALL% - -REM set CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% -REM if defined CMAKE_GENERATOR ( - REM set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% -REM ) else ( - REM set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" -REM ) - -REM set MSBUILDDISABLENODEREUSE=1 - -REM cd %BUILD_DIR% - -REM echo. -REM echo -------------------------------------------------------------------------- -REM echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% -REM echo -------------------------------------------------------------------------- - -REM %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% -REM if NOT %ERRORLEVEL% == 0 ( - REM echo "ERROR on cmake" - REM exit 1 -REM ) - -REM echo. -REM echo -------------------------------------------------------------------------- -REM echo *** cmake --build . --config Release --target INSTALL -REM echo -------------------------------------------------------------------------- - -REM %CMAKE_ROOT%\bin\cmake --build . --config Release --target INSTALL -REM if NOT %ERRORLEVEL% == 0 ( - REM echo "ERROR on cmake build" - REM exit 2 -REM ) - -REM cp %PRODUCT_INSTALL%\lib\libpng15.lib %PRODUCT_INSTALL%\lib\libpng.lib -REM if NOT %ERRORLEVEL% == 0 ( - REM echo "ERROR on copy libpng15.lib" - REM exit 3 -REM ) - -REM taskkill /F /IM "mspdbsrv.exe" - -REM echo. -REM echo ########## END diff --git a/products/compil_scripts/llvm-8.0.1.bat b/products/compil_scripts/llvm-8.0.1.bat index c0fbc05..5ebb2c9 100644 --- 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 79a6b94..883450f 100755 --- 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 ) +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 @@ -35,11 +39,7 @@ if DEFINED SAT_HPC ( SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DMEDFILE_USE_MPI:BOOL=OFF ) -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% cd %BUILD_DIR% diff --git a/products/compil_scripts/metis-5.1.0.bat b/products/compil_scripts/metis-5.1.0.bat index aef0223..cc71344 100755 --- 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 ) +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,7 +29,7 @@ if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% mkdir %BUILD_DIR% cd %BUILD_DIR% -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% -DCMAKE_BUILD_TYPE:STRING=%PRODUCT_BUILD_TYPE% set MSBUILDDISABLENODEREUSE=1 diff --git a/products/compil_scripts/netgen-6.2.2101.bat b/products/compil_scripts/netgen-6.2.2101.bat index 06e97bf..5abd8a5 100644 --- 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 e41b901..3054ea8 100644 --- 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 818c73e..e0a1011 100755 --- 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 ) +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,11 +33,7 @@ dos2unix -q %SOURCE_DIR%/libsrc/occ/* dos2unix -q %SOURCE_DIR%/libsrc/nglib/* 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 15 2017 Win64" -) +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% set MSBUILDDISABLENODEREUSE=1 set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DZLIB_ROOT_DIR=%ZLIB_DIR% diff --git a/products/compil_scripts/openVKL-0.11.0.bat b/products/compil_scripts/openVKL-0.11.0.bat index e26f986..e29f1c0 100644 --- 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 0235116..a7251c6 100644 --- 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 6ac2155..3680921 100755 --- 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 ) +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 ( @@ -34,7 +38,7 @@ if %SAT_DEBUG% == 0 ( SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_opencv_java:STRING=OFF REM OpenBLAS triggers a compilation issue / So stay as we were before the introduction of OpenBLAS SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DWITH_LAPACK:BOOL=OFF -SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% cd %BUILD_DIR% diff --git a/products/compil_scripts/openturns.bat b/products/compil_scripts/openturns.bat index ea2eca6..5c800ee 100644 --- 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 aac53bc..62319c2 100644 --- 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 5e6fab8..fae67e0 100644 --- 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 db7b538..552bec2 100755 --- a/products/compil_scripts/zlib.bat +++ b/products/compil_scripts/zlib.bat @@ -1,7 +1,7 @@ @echo off echo ########################################################################## -echo zlib %VERSION% +echo zlib (binary) %VERSION% echo ########################################################################## if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% @@ -26,47 +26,3 @@ if NOT %ERRORLEVEL% == 0 ( echo. echo ########## END - -REM if exist "%PRODUCT_INSTALL%" rmdir /Q /S "%PRODUCT_INSTALL%" -REM mkdir %PRODUCT_INSTALL% - -REM set CMAKE_OPTIONS=-DCMAKE_INSTALL_PREFIX:STRING=%PRODUCT_INSTALL:\=/% -REM if defined CMAKE_GENERATOR ( - REM set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% -REM ) else ( - REM set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" -REM ) -REM set MSBUILDDISABLENODEREUSE=1 - -REM cd %BUILD_DIR% - -REM echo. -REM echo -------------------------------------------------------------------------- -REM echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% -REM echo -------------------------------------------------------------------------- - -REM %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% -REM if NOT %ERRORLEVEL% == 0 ( - REM echo ERROR on cmake - REM exit 1 -REM ) - -REM echo. -REM echo -------------------------------------------------------------------------- -REM echo *** %CMAKE_ROOT%\bin\cmake --build . --config Release --target INSTALL -REM echo -------------------------------------------------------------------------- - -REM %CMAKE_ROOT%\bin\cmake --build . --config Release --target INSTALL -REM if NOT %ERRORLEVEL% == 0 ( - REM echo ERROR on cmake build - REM exit 2 -REM ) - -REM cp %PRODUCT_INSTALL%\lib\zlib.lib %PRODUCT_INSTALL%\lib\zlib1.lib -REM cp %PRODUCT_INSTALL%\lib\zlib.lib %PRODUCT_INSTALL%\lib\z.lib -REM cp %PRODUCT_INSTALL%\bin\zlib.dll %PRODUCT_INSTALL%\bin\zlib1.dll - -REM taskkill /F /IM "mspdbsrv.exe" - -REM echo. -REM echo ########## END \ No newline at end of file -- 2.39.2