From: Nabil Ghodbane Date: Wed, 24 May 2023 20:16:16 +0000 (+0200) Subject: bos #33720: X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FV9_10_BR;p=tools%2Fsat_salome.git bos #33720: 1/ YACS, PY2CPP, YDEFX, OPENTURNS_SALOME - target development branch 2/ Factorise openturns-1.20.1 build script 3/ switch on fftw, openblas,fmilibrary,pyfmi, as well as remaining openturns modules --- diff --git a/applications/SALOME-9.11.0-windows.pyconf b/applications/SALOME-9.11.0-windows.pyconf index ea477d8..7789f7b 100644 --- a/applications/SALOME-9.11.0-windows.pyconf +++ b/applications/SALOME-9.11.0-windows.pyconf @@ -59,6 +59,8 @@ APPLICATION : embree : '3.12.2' expat : '2.0.1' f2c : '1.0.0' + fftw: '3.3.9' + FMILibrary : '2.0.3' freeimage : '3.18.0' freetype : '2.9.1' gmsh : '4.10.3' @@ -95,12 +97,13 @@ APPLICATION : ospray : '2.4.0' packaging : '19.0' ParaView : {tag:'5.11.0', base: 'no', section: 'version_5_11_0'} - #PERSALYS: 'v14.0.1' + PERSALYS: 'v14.0.1' perl : '5.28.1.1' Pillow : '7.1.1' planegcs : '0.18-3cb6890' psutil : '5.7.2' pthreads : '2.9.1' + PyFMI : '2.6' Pygments : '2.4.2' pyparsing : '2.4.0' PyQt : '5.15.3' @@ -128,6 +131,7 @@ APPLICATION : sphinx_rtd_theme : '0.4.3' sphinxintl: '2.0.0' StaticMeshPlugin: '5.11.0' + statsmodels: '0.9.0' swig : '4.0.2' tbb : '2019_U8_win' toml : '0.10.2' @@ -159,7 +163,7 @@ APPLICATION : 'FIELDS' 'PARAVIS' 'JOBMANAGER' - 'YACS' + 'YACS' : 'bos/33720' #FIXME 'YACSGEN' 'DOCUMENTATION' 'SAMPLES' @@ -172,9 +176,9 @@ APPLICATION : 'EFICAS_TOOLS' : 'master' #FIXME 'ADAO' : 'master' #FIXME 'PARAVISADDONS' : 'master' #FIXME - 'PY2CPP' : 'master' #FIXME - #'OPENTURNS_SALOME' - #'YDEFX' + 'PY2CPP' : 'bos/33720' #FIXME + 'OPENTURNS_SALOME' : 'bos/33720' #FIXME + 'YDEFX' : 'bos/33720' #FIXME 'pmml' #'TESTBASE' 'CEATESTBASE' : 'SalomeV9' @@ -202,7 +206,7 @@ __overwrite__ : [ { __condition__ : "APPLICATION.debug == 'yes'" - 'APPLICATION.rm_products' : ['matplotlib', 'openturns', 'scipy', 'Pillow'] + 'APPLICATION.rm_products' : ['matplotlib', 'openturns', 'scipy', 'Pillow', 'PERSALYS', 'OPENTURNS_SALOME', 'cminpack', 'openblas', 'FMILibrary', 'PyFMI', 'fftw', 'statsmodel'] # TODO: cmake 3.24 screws things up by adding _d suffix to debug libraries to KERNEL 'APPLICATION.products.cmake' : {tag: '3.12.1', base: 'no', section : 'version_3_12_1' } 'APPLICATION.products.numpy' : {tag: '1.16.4', base: 'no', section : 'version_1_16_4_win_dbg' } diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index 1b9dc2b..b909a5c 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -59,6 +59,7 @@ APPLICATION : embree : '3.12.2' expat : '2.0.1' f2c : '1.0.0' + fftw: '3.3.9' FMILibrary : '2.0.3' freeimage : '3.18.0' freetype : '2.9.1' @@ -130,6 +131,7 @@ APPLICATION : sphinx_rtd_theme : '0.4.3' sphinxintl: '2.0.0' StaticMeshPlugin: '5.11.0' + statsmodels: '0.9.0' swig : '4.0.2' tbb : '2019_U8_win' toml : '0.10.2' @@ -161,7 +163,7 @@ APPLICATION : 'FIELDS' 'PARAVIS' 'JOBMANAGER' - 'YACS' + 'YACS' : 'bos/33720' 'YACSGEN' 'DOCUMENTATION' 'SAMPLES' @@ -174,11 +176,11 @@ APPLICATION : 'EFICAS_TOOLS' 'ADAO' 'PARAVISADDONS' - 'PY2CPP' - 'OPENTURNS_SALOME' - #'YDEFX' + 'PY2CPP' : 'bos/33720' + 'OPENTURNS_SALOME' : 'bos/33720' + 'YDEFX' : 'bos/33720' 'pmml' - 'TESTBASE' + #'TESTBASE' 'CEATESTBASE' : 'SalomeV9' } profile : @@ -204,7 +206,7 @@ __overwrite__ : [ { __condition__ : "APPLICATION.debug == 'yes'" - 'APPLICATION.rm_products' : ['matplotlib', 'openturns', 'scipy', 'Pillow', 'PERSALYS', 'OPENTURNS_SALOME', 'cminpack', 'openblas', 'FMILibrary', 'PyFMI'] + 'APPLICATION.rm_products' : ['matplotlib', 'openturns', 'scipy', 'Pillow', 'PERSALYS', 'OPENTURNS_SALOME', 'cminpack', 'openblas', 'FMILibrary', 'PyFMI', 'fftw', 'statsmodel'] # TODO: cmake 3.24 screws things up by adding _d suffix to debug libraries to KERNEL 'APPLICATION.products.cmake' : {tag: '3.12.1', base: 'no', section : 'version_3_12_1' } 'APPLICATION.products.numpy' : {tag: '1.16.4', base: 'no', section : 'version_1_16_4_win_dbg' } diff --git a/products/FMILibrary.pyconf b/products/FMILibrary.pyconf index bd07ea3..0e02d58 100644 --- a/products/FMILibrary.pyconf +++ b/products/FMILibrary.pyconf @@ -39,3 +39,10 @@ version_2_0_3 : { patches : ['FMILibrary-2.0.3-installdir.patch'] } + +version_2_0_3_win : +{ + build_source : "script" + compil_script : 'FMILibrary-2.0.3.bat' + patches : ['FMILibrary-2.0.3-installdir.patch'] +} diff --git a/products/OPENTURNS_SALOME.pyconf b/products/OPENTURNS_SALOME.pyconf index d28f5fe..2eca4e4 100644 --- a/products/OPENTURNS_SALOME.pyconf +++ b/products/OPENTURNS_SALOME.pyconf @@ -52,5 +52,5 @@ default_win : 'YACS', 'openturns' ] - patches : ['openturns_salome.001.patch'] + patches : [] } diff --git a/products/PERSALYS.pyconf b/products/PERSALYS.pyconf index 164af14..114a203 100644 --- a/products/PERSALYS.pyconf +++ b/products/PERSALYS.pyconf @@ -86,7 +86,8 @@ version_v14_0_1_win : 'FMILibrary', 'PyFMI', 'YACS', - #'YDEFX', + 'YDEFX', + 'PY2CPP', 'CAS', 'CONFIGURATION', 'openblas', diff --git a/products/PY2CPP.pyconf b/products/PY2CPP.pyconf index 01ad41e..fa10bc9 100644 --- a/products/PY2CPP.pyconf +++ b/products/PY2CPP.pyconf @@ -2,7 +2,6 @@ default : { name : "PY2CPP" build_source : "cmake" - get_source : "git" git_info: { @@ -30,10 +29,11 @@ default : default_win : { + cmake_options : " -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON " properties: { incremental : "yes" single_install_dir : "no" # aimed to solve sat #18914 } - patches : ['py2cpp-9.11.0-lib.patch'] + patches : [] } diff --git a/products/YACS.pyconf b/products/YACS.pyconf index 1a2ef65..a2c7915 100644 --- a/products/YACS.pyconf +++ b/products/YACS.pyconf @@ -49,7 +49,7 @@ default : default_win : { - patches : ['yacs.persalys-14.0.1.patch'] + patches : [] } version_9_2_0_to_9_8_0 : diff --git a/products/YDEFX.pyconf b/products/YDEFX.pyconf index d79bd5c..42a9ae0 100644 --- a/products/YDEFX.pyconf +++ b/products/YDEFX.pyconf @@ -33,6 +33,13 @@ default : patches : [] } +default_win : +{ + build_source : "script" + cmake_options : " -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON " + patches : [] +} + version_V9_10_0 : { # prescription de EDF ne fonctionne pas en dehors de YAMS diff --git a/products/compil_scripts/FMILibrary-2.0.3.bat b/products/compil_scripts/FMILibrary-2.0.3.bat new file mode 100644 index 0000000..39a9299 --- /dev/null +++ b/products/compil_scripts/FMILibrary-2.0.3.bat @@ -0,0 +1,70 @@ +@echo off + +echo ########################################################################## +echo FMILibrary %VERSION% +echo ########################################################################## + +IF NOT DEFINED SAT_DEBUG ( + SET SAT_DEBUG=0 +) + +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 +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% +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" + +cd %BUILD_DIR% + +echo. +echo -------------------------------------------------------------------------- +echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% +echo -------------------------------------------------------------------------- + +%CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on FMILibrary + exit 1 +) + +REM Strangely fails on node if latest Windows SDK +sed -i 's/Shlwapi.lib/ /g' fmilib.vcxproj + +echo. +echo -------------------------------------------------------------------------- +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release ALL_BUILD.vcxproj +echo -------------------------------------------------------------------------- + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild ALL_BUILD.vcxproj + exit 2 +) + +echo. +echo -------------------------------------------------------------------------- +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj +echo -------------------------------------------------------------------------- + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild INSTALL.vcxproj + exit 3 +) + +echo. +echo ########## END diff --git a/products/compil_scripts/OPENTURNS_SALOME.bat b/products/compil_scripts/OPENTURNS_SALOME.bat index 2c49ef3..a0d21b1 100644 --- a/products/compil_scripts/OPENTURNS_SALOME.bat +++ b/products/compil_scripts/OPENTURNS_SALOME.bat @@ -107,7 +107,8 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGNS_INCLUDE_DIR:PATH=%CGNS_ROOT_DIR:\=/%/in set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGNS_LIBRARY:STRING=%CGNS_ROOT_DIR:\=/%/lib/cgnsdll.lib SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGNS_INCLUDE_DIR:PATH=%CGNS_ROOT_DIR:\=/%/include -SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPersalys_DIR=%PERSALYS_ROOT_DIR:\=/% -DOPENTURNS_HOME=%OPENTURNS_HOME:\=/% +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPersalys_DIR=%PERSALYS_ROOT_DIR:\=/% +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DOPENTURNS_HOME=%OPENTURNS_HOME:\=/% SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% REM clean BUILD directory diff --git a/products/compil_scripts/PERSALYS-v14.0.1.bat b/products/compil_scripts/PERSALYS-v14.0.1.bat index 459f1b1..eedaab8 100644 --- a/products/compil_scripts/PERSALYS-v14.0.1.bat +++ b/products/compil_scripts/PERSALYS-v14.0.1.bat @@ -84,7 +84,7 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DKERNEL_ROOT_DIR=%KERNEL_ROOT_DIR:\=/% SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DSalomeKERNEL_DIR=%KERNEL_ROOT_DIR:\=/%/salome_adm/cmake_files SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DOpenTURNS_DIR=%OT_ROOT_DIR:\=/%/lib/cmake/openturns SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dotmorris_DIR==%OT_ROOT_DIR:\=/%/lib/cmake/otmorris -rem SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPy2cpp_DIR=%PY2CPP_ROOT_DIR:\=/%/lib/cmake/py2cpp +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPy2cpp_DIR=%PY2CPP_ROOT_DIR:\=/%/lib/cmake/py2cpp SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DQWT_INCLUDE_DIR=%QWT_ROOT_DIR:\=/%/include SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DQWT_LIBRARY=%QWT_ROOT_DIR:\=/%/lib/qwt.lib @@ -93,7 +93,7 @@ SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DUSE_SPHINX=OFF SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DSPHINX_ROOT_DIR=%SPHINX_ROOT_DIR:\=/% SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DYACS_ROOT_DIR=%YACS_ROOT_DIR:\=/% SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DSalomeYACS_DIR=%YACS_ROOT_DIR:\=/%/adm/cmake -rem SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dydefx_DIR=%YDEFX_ROOT_DIR:\=/%/salome_adm/cmake_files +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dydefx_DIR=%YDEFX_ROOT_DIR:\=/%/salome_adm/cmake_files SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DAdaoCppLayer_INCLUDE_DIR=%ADAO_INTERFACE_ROOT_DIR:\=/%/include SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DAdaoCppLayer_ROOT_DIR=%ADAO_INTERFACE_ROOT_DIR:\=/% SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DUSE_SALOME=ON diff --git a/products/compil_scripts/ParaView-5.11.0.bat b/products/compil_scripts/ParaView-5.11.0.bat index 424734c..21c26f3 100644 --- a/products/compil_scripts/ParaView-5.11.0.bat +++ b/products/compil_scripts/ParaView-5.11.0.bat @@ -8,6 +8,9 @@ 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,8 +207,14 @@ 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" + +IF DEFINED OT_VERSION ( + set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPARAVIEW_ENABLE_OPENTURNS=ON -DOpenTURNS_DIR=%OT_ROOT_DIR:\=/%/lib/cmake/openturns +) + +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% cd %BUILD_DIR% + echo. echo INFO: running command: %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% diff --git a/products/compil_scripts/YDEFX.bat b/products/compil_scripts/YDEFX.bat index 44347d8..45c5671 100644 --- a/products/compil_scripts/YDEFX.bat +++ b/products/compil_scripts/YDEFX.bat @@ -24,6 +24,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_WINDOWS_EXPORT_ALL_SYMBOLS=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" diff --git a/products/compil_scripts/fftw-3.3.9.bat b/products/compil_scripts/fftw-3.3.9.bat new file mode 100644 index 0000000..3e306f4 --- /dev/null +++ b/products/compil_scripts/fftw-3.3.9.bat @@ -0,0 +1,67 @@ +@echo off + +echo ########################################################################## +echo fftw %VERSION% +echo ########################################################################## + +IF NOT DEFINED SAT_DEBUG ( + SET SAT_DEBUG=0 +) + +SET PRODUCT_BUILD_TYPE=Release + +REM TODO: NGH: not Tested yet +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 +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% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_GENERATOR=%CMAKE_GENERATOR% + +cd %BUILD_DIR% +set PATH=%BUILD_DIR%\bin;%PATH% + +echo. +echo -------------------------------------------------------------------------- +echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% +echo -------------------------------------------------------------------------- + +%CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on fftw + exit 1 +) + +echo. +echo -------------------------------------------------------------------------- +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=Release /p:Platform=x64 ALL_BUILD.vcxproj +echo -------------------------------------------------------------------------- + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild ALL_BUILD.vcxproj + exit 2 +) + +echo. +echo -------------------------------------------------------------------------- +echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj +echo -------------------------------------------------------------------------- + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild INSTALL.vcxproj + exit 3 +) + +echo. +echo ########## END diff --git a/products/compil_scripts/openturns-1.20.1.bat b/products/compil_scripts/openturns-1.20.1.bat index 9a19491..455659d 100644 --- a/products/compil_scripts/openturns-1.20.1.bat +++ b/products/compil_scripts/openturns-1.20.1.bat @@ -8,16 +8,20 @@ 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 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% +mkdir %BUILD_DIR% REM clean BUILD directory if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% @@ -29,6 +33,60 @@ SET PATH=%CWD%\bin;%PATH% SET PYTHONPATH=%CWD%;%PYTHONPATH% SET PYTHONPATH=%PRODUCT_INSTALL%\lib\python%PYTHON_VERSION%\site-packages;%PYTHONPATH% +GOTO:MAIN + +:MODULE_BUILDER + SETLOCAL ENABLEDELAYEDEXPANSION + SET MODULE_NAME=%~1 + SET MODULE_SOURCE_DIR=%~2 + SET MODULE_BUILD_DIR=%~3 + SET MODULE_INSTALL_DIR=%~4 + SET X=%~5 + SET MODULE_CMAKE_OPTIONS=%X:'="% + REM NGH: We replace ' with " - we could of course parse the input. + ECHO call MODULE_BUILDER for %MODULE_NAME% + ECHO command line option: %MODULE_CMAKE_OPTIONS% + REM TODO: NGH: not Tested yet + if exist "%MODULE_BUILD_DIR%" rmdir /Q /S %MODULE_BUILD_DIR% + mkdir %MODULE_BUILD_DIR% + cd %MODULE_BUILD_DIR% + + echo. + echo -------------------------------------------------------------------------- + echo *** %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR% + echo -------------------------------------------------------------------------- + %CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %MODULE_CMAKE_OPTIONS% %MODULE_SOURCE_DIR% + if NOT %ERRORLEVEL% == 0 ( + echo ERROR on cmake + exit 1 + ) + + 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 + if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild ALL_BUILD.vcxproj + exit 2 + ) + + echo. + echo -------------------------------------------------------------------------- + echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj + echo -------------------------------------------------------------------------- + + msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj + if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild INSTALL.vcxproj + exit 3 + ) + ENDLOCAL +EXIT /B 0 + + +:MAIN + 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% @@ -56,10 +114,10 @@ set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCBLAS_DIR=%OPENBLAS_ROOT_DIR:\=/%/share/cmak set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPython3_EXECUTABLE:FILEPATH=%PYTHON_ROOT_DIR:\=/%/python3.exe set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPython3_INCLUDE_DIR:PATH=%PYTHON_ROOT_DIR:\=/%/include set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLAPACK_LIBRARIES:FILEPATH=%OPENBLAS_ROOT_DIR:\=/%/lib/openblas.lib -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_SHARED_LINKER_FLAGS_RELEASE="/OPT:NOREF /INCREMENTAL:NO" +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_SHARED_LINKER_FLAGS_RELEASE='/OPT:NOREF /INCREMENTAL:NO' set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_UNITY_BUILD=ON set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCMAKE_UNITY_BUILD_BATCH_SIZE=16 -set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DSWIG_COMPILE_FLAGS="/bigobj" +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DSWIG_COMPILE_FLAGS='/bigobj' set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DUSE_SPHINX=OFF if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% @@ -68,124 +126,201 @@ if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% mkdir %BUILD_DIR% cd %BUILD_DIR% -mkdir openturns mkdir cache mkdir cache\pip -cd %BUILD_DIR%\openturns +echo ########################################################################## +echo openturns 1.20.1 +echo ########################################################################## +SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% +CALL:MODULE_BUILDER openturns "%SOURCE_DIR%\openturns-1.20.1" "%BUILD_DIR%\openturns" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" -set MSBUILDDISABLENODEREUSE=1 +set PATH=%PRODUCT_INSTALL%\bin;%PRODUCT_INSTALL%\lib;%PATH% +set PYTHONPATH=%PRODUCT_INSTALL%\lib\site-packages;%PYTHONPATH% -echo. -echo ********************************************************************* -echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%\openturns-1.20.1 -echo ********************************************************************* -echo. +echo ########################################################################## +echo otagrum 0.6 [SKIPPED] +echo ########################################################################## +REM SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_DOC=OFF +REM CALL:MODULE_BUILDER otagrum "%SOURCE_DIR%\otagrum-0.6" "%BUILD_DIR%\otagrum" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" -%CMAKE_ROOT%\bin\cmake -G "Visual Studio 15 2017 Win64" %CMAKE_OPTIONS% %SOURCE_DIR%\openturns-1.20.1 -if NOT %ERRORLEVEL% == 0 ( - echo "ERROR on cmake" - exit 1 -) +echo ########################################################################## +echo otmorris 0.13 +echo ########################################################################## +SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% +CALL:MODULE_BUILDER otmorris "%SOURCE_DIR%\otmorris-0.13" "%BUILD_DIR%\otmorris" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" -echo. -echo ********************************************************************* -echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj +echo ########################################################################## +echo otfftw 0.12 +echo ########################################################################## +SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% +CALL:MODULE_BUILDER otfftw "%SOURCE_DIR%\otfftw-0.12" "%BUILD_DIR%\otfftw" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" -echo ********************************************************************* -echo. +echo ########################################################################## +echo otmixmod 0.13 [SKIPPED] +echo ########################################################################## +SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% +REM CALL:MODULE_BUILDER otmixmod "%SOURCE_DIR%\otmixmod-0.13" "%BUILD_DIR%\otmixmod" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" -REM ON PURPOSE, we CONTINUE if fails since the error are about porting some NR to Windows native build (openturns team uses mingw) -msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj -if NOT %ERRORLEVEL% == 0 ( - echo ERROR on msbuild ALL_BUILD.vcxproj, please check! - REM exit 2 -) +echo ########################################################################## +echo otpmml 1.12 +echo ########################################################################## +SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_DOC=OFF +CALL:MODULE_BUILDER otpmml "%SOURCE_DIR%\otpmml-1.12" "%BUILD_DIR%\otpmml" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" + +echo ########################################################################## +echo otrobopt 0.11 +echo ########################################################################## +SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_DOC=OFF +CALL:MODULE_BUILDER otrobopt "%SOURCE_DIR%\otrobopt-0.11" "%BUILD_DIR%\otrobopt" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" + +echo ########################################################################## +echo otsubsetinverse 1.9 +echo ########################################################################## +SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_DOC=OFF +CALL:MODULE_BUILDER otsubsetinverse "%SOURCE_DIR%\otsubsetinverse-1.9" "%BUILD_DIR%\otsubsetinverse" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" + +echo ########################################################################## +echo otsvm 0.11 +echo ########################################################################## +SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_DOC=OFF +CALL:MODULE_BUILDER otsvm "%SOURCE_DIR%\otsvm-0.11" "%BUILD_DIR%\otsvm" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" -echo. -echo ********************************************************************* -echo *** installation... -echo ********************************************************************* -echo. +echo ########################################################################## +echo otfmi 0.15 +echo ########################################################################## +cd %BUILD_DIR% +mkdir otfmi -msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj +set CMAKE_OPTIONS_EXT=%CMAKE_OPTIONS% +cd %BUILD_DIR%\otfmi +xcopy %SOURCE_DIR%\otfmi-0.15\* %BUILD_DIR%\otfmi /E /I /Q if NOT %ERRORLEVEL% == 0 ( - echo ERROR on msbuild INSTALL.vcxproj + echo ERROR on xcopy exit 3 ) -set PATH=%PRODUCT_INSTALL%\bin;%PRODUCT_INSTALL%\lib;%PATH% -set PYTHONPATH=%PRODUCT_INSTALL%\lib\site-packages;%PYTHONPATH% +%PYTHON_ROOT_DIR%\python.exe setup.py install --prefix=%PRODUCT_INSTALL% +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on python setup.py + exit 3 +) +echo echo ########################################################################## -echo otmorris 0.13 +echo scikit-learn 0.24.2 echo ########################################################################## cd %BUILD_DIR% -mkdir otmorris +mkdir scikit-learn +cd %BUILD_DIR%\scikit-learn +xcopy %SOURCE_DIR%\scikit-learn-0.24.2\* %BUILD_DIR%\scikit-learn /E /I /Q +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on xcopy + exit 3 +) -set CMAKE_OPTIONS_EXT=%CMAKE_OPTIONS% -cd %BUILD_DIR%\otmorris +%PYTHON_ROOT_DIR%\python.exe -m pip install --cache-dir=%BUILD_DIR%\cache\pip --prefix=%PRODUCT_INSTALL% scikit-learn-0.24.2.tar.gz --no-deps +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on python setup.py + exit 3 +) -set MSBUILDDISABLENODEREUSE=1 +echo +echo ########################################################################## +echo decorator 5.1.0 +echo ########################################################################## +cd %BUILD_DIR% +mkdir decorator +cd %BUILD_DIR%\decorator +xcopy %SOURCE_DIR%\decorator-5.1.0\* %BUILD_DIR%\decorator /E /I /Q +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on xcopy + exit 3 +) -echo. -echo ********************************************************************* -echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR%\otmorris-0.13 -echo ********************************************************************* -echo. +%PYTHON_ROOT_DIR%\python.exe -m pip install --cache-dir=%BUILD_DIR%\cache\pip --prefix=%PRODUCT_INSTALL% decorator-5.1.0-py3-none-any.whl --no-deps +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on python setup.py + exit 3 +) -%CMAKE_ROOT%\bin\cmake -G "Visual Studio 15 2017 Win64" %CMAKE_OPTIONS% %SOURCE_DIR%\otmorris-0.13 +echo +echo ########################################################################## +echo threadpoolctl 3.0.0 +echo ########################################################################## +cd %BUILD_DIR% +mkdir threadpoolctl +cd %BUILD_DIR%\threadpoolctl +xcopy %SOURCE_DIR%\threadpoolctl-3.0.0\* %BUILD_DIR%\threadpoolctl /E /I /Q if NOT %ERRORLEVEL% == 0 ( - echo "ERROR on cmake" - exit 1 + echo ERROR on xcopy + exit 3 ) -echo. -echo ********************************************************************* -echo *** msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj +%PYTHON_ROOT_DIR%\python.exe -m pip install --cache-dir=%BUILD_DIR%\cache\pip --prefix=%PRODUCT_INSTALL% threadpoolctl-3.0.0-py3-none-any.whl --no-deps +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on python setup.py + exit 3 +) -echo ********************************************************************* -echo. +echo +echo ########################################################################## +echo joblib 1.1.0 +echo ########################################################################## +cd %BUILD_DIR% +mkdir joblib +cd %BUILD_DIR%\joblib +xcopy %SOURCE_DIR%\joblib-1.1.0\* %BUILD_DIR%\joblib /E /I /Q +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on xcopy + exit 3 +) -REM ON PURPOSE, we CONTINUE if fails since the error are about porting some NR to Windows native build (openturns team uses mingw) -msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 ALL_BUILD.vcxproj +%PYTHON_ROOT_DIR%\python.exe -m pip install --cache-dir=%BUILD_DIR%\cache\pip --prefix=%PRODUCT_INSTALL% joblib-1.1.0-py2.py3-none-any.whl --no-deps if NOT %ERRORLEVEL% == 0 ( - echo ERROR on msbuild ALL_BUILD.vcxproj, please check! - REM exit 2 + echo ERROR on python setup.py + exit 3 ) -echo. -echo ********************************************************************* -echo *** installation... -echo ********************************************************************* -echo. +echo ########################################################################## +echo otpod 0.6.9 +echo ########################################################################## +cd %BUILD_DIR% +mkdir otpod -msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 INSTALL.vcxproj +set CMAKE_OPTIONS_EXT=%CMAKE_OPTIONS% +cd %BUILD_DIR%\otpod +xcopy %SOURCE_DIR%\otpod-0.6.9\* %BUILD_DIR%\otpod /E /I /Q if NOT %ERRORLEVEL% == 0 ( - echo ERROR on msbuild INSTALL.vcxproj + echo ERROR on xcopy exit 3 ) +%PYTHON_ROOT_DIR%\python.exe setup.py install --prefix=%PRODUCT_INSTALL% +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on python setup.py + exit 3 +) echo ########################################################################## -echo otfmi 0.15 +echo otwrapy 0.11 echo ########################################################################## cd %BUILD_DIR% -mkdir otfmi +mkdir otwrapy -set CMAKE_OPTIONS_EXT=%CMAKE_OPTIONS% -cd %BUILD_DIR%\otfmi -xcopy %SOURCE_DIR%\otfmi-0.15\* %BUILD_DIR%\otfmi /E /I /Q +set CMAKE_OPTIONS_EXT=%CMAKE_OPTIONS% +cd %BUILD_DIR%\otwrapy +xcopy %SOURCE_DIR%\otwrapy-0.11\* %BUILD_DIR%\otwrapy /E /I /Q if NOT %ERRORLEVEL% == 0 ( echo ERROR on xcopy exit 3 ) -REM %PYTHON_ROOT_DIR%\python.exe setup.py install --prefix=%PRODUCT_INSTALL% -REM if NOT %ERRORLEVEL% == 0 ( - REM echo ERROR on python setup.py - REM exit 3 -REM ) +%PYTHON_ROOT_DIR%\python.exe setup.py install --prefix=%PRODUCT_INSTALL% +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on python setup.py + exit 3 +) echo echo "########## END" diff --git a/products/env_scripts/PERSALYS.py b/products/env_scripts/PERSALYS.py index f3724c4..fc49fd2 100644 --- a/products/env_scripts/PERSALYS.py +++ b/products/env_scripts/PERSALYS.py @@ -1,6 +1,6 @@ #!/usr/bin/env python import os.path - +import platform def set_env(env, prereq_dir, version): pvversion='paraview-' + env.get('PARAVIEW_VERSION') env.set('PERSALYS_ROOT_DIR', prereq_dir) @@ -8,10 +8,14 @@ def set_env(env, prereq_dir, version): env.set('OTGUI_DIR', prereq_dir) env.set('OTGUI_ROOT_DIR', prereq_dir) env.prepend('PATH', os.path.join(prereq_dir,'bin')) - env.prepend('LD_LIBRARY_PATH', os.path.join(prereq_dir, 'lib')) - env.prepend('PV_PLUGIN_PATH', os.path.join(prereq_dir, 'lib', pvversion, 'plugins')) - pyver = 'python' + env.get('PYTHON_VERSION') - env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages')) + if platform.system() == "Windows" : + env.prepend('PV_PLUGIN_PATH', os.path.join(prereq_dir, 'bin', pvversion, 'plugins')) + env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib','site-packages')) + else: + env.prepend('PV_PLUGIN_PATH', os.path.join(prereq_dir, 'lib', pvversion, 'plugins')) + env.prepend('LD_LIBRARY_PATH', os.path.join(prereq_dir, 'lib')) + pyver = 'python' + env.get('PYTHON_VERSION') + env.prepend('PYTHONPATH', os.path.join(prereq_dir, 'lib', pyver, 'site-packages')) env.set('OTGUI_HTML_DOCUMENTATION_PATH',os.path.join(prereq_dir,'share','otgui','doc','html/')) env.set('PERSALYS_HTML_DOCUMENTATION_PATH', os.path.join(prereq_dir,'share','persalys','doc','html/')) diff --git a/products/env_scripts/fftw.py b/products/env_scripts/fftw.py index b1458a9..e985216 100644 --- a/products/env_scripts/fftw.py +++ b/products/env_scripts/fftw.py @@ -7,12 +7,9 @@ import platform def set_env(env, prereq_dir, version): env.set('FFTW_DIR', prereq_dir) env.set('FFTW_ROOT_DIR', prereq_dir) - - env.prepend('INCLUDE', os.path.join(prereq_dir, 'include')) env.prepend('PATH', os.path.join(prereq_dir, 'bin')) - if not platform.system() == "Windows" : - pyver = 'python' + env.get('PYTHON_VERSION') + env.prepend('INCLUDE', os.path.join(prereq_dir, 'include')) env.prepend('LD_LIBRARY_PATH', os.path.join(prereq_dir, 'lib')) def set_nativ_env(env): diff --git a/products/env_scripts/openblas.py b/products/env_scripts/openblas.py index 94c0a77..4c5ab42 100644 --- a/products/env_scripts/openblas.py +++ b/products/env_scripts/openblas.py @@ -7,6 +7,8 @@ import platform def set_env(env, prereq_dir, version): env.set('OPENBLASHOME', prereq_dir) env.set('OPENBLAS_ROOT_DIR', prereq_dir) + env.set('OpenBLAS_DIR', prereq_dir) + env.set('BLAS_ROOT_DIR', prereq_dir) env.set('OPENBLAS_SRC', os.path.join(prereq_dir,'SRC')) env.set('BLAS_SRC', os.path.join(prereq_dir,'BLAS','SRC')) diff --git a/products/fftw.pyconf b/products/fftw.pyconf index 999b786..50ce309 100644 --- a/products/fftw.pyconf +++ b/products/fftw.pyconf @@ -36,3 +36,16 @@ default_win : single_install_dir : "yes" } } + +version_3_3_9 : +{} + +version_3_3_9_win: +{ + compil_script: "fftw-3.3.9.bat" + properties: + { + incremental : "yes" + single_install_dir : "no" + } +} diff --git a/products/openturns.pyconf b/products/openturns.pyconf index e24043c..a0755f3 100644 --- a/products/openturns.pyconf +++ b/products/openturns.pyconf @@ -24,7 +24,7 @@ default : default_win : { - name : "OT" + name : "openturns" compil_script : 'pip_install' + $VARS.scriptExtension properties : { @@ -47,12 +47,12 @@ version_1_20_1 : version_1_20_1_win : { name : "OT" + compil_script : "openturns-1.20.1.bat" source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + 'openturns' build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name install_dir : 'base' - compil_script : "openturns-1.20.1.bat" - depend : ['Python', 'openblas', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib'] - opt_depend : [] + depend : ['Python', 'openblas', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'matplotlib', 'fftw'] + opt_depend : [ 'statsmodels'] patches : ["openturns-1.20.1.0004.patch", "openturns-1.20.1.0005.patch"] properties : { diff --git a/products/patches/PERSALYS-v14.0.1-001.patch b/products/patches/PERSALYS-v14.0.1-001.patch index da84ed3..13fb3f0 100644 --- a/products/patches/PERSALYS-v14.0.1-001.patch +++ b/products/patches/PERSALYS-v14.0.1-001.patch @@ -1,7 +1,7 @@ diff -Naur persalys_v14.0.1_ref/CMakeLists.txt persalys_v14.0.1_dev/CMakeLists.txt --- persalys_v14.0.1_ref/CMakeLists.txt 2023-03-31 08:59:27.000000000 +0200 -+++ persalys_v14.0.1_dev/CMakeLists.txt 2023-05-22 09:09:43.385983013 +0200 -@@ -43,8 +43,19 @@ ++++ persalys_v14.0.1_dev/CMakeLists.txt 2023-05-23 12:46:41.640288727 +0200 +@@ -43,8 +43,16 @@ list (APPEND PERSALYS_DEFINITIONS "-DPERSALYS_STATIC -DPYINTERP_STATIC -DPYCONSOLE_STATIC") endif () @@ -10,29 +10,15 @@ diff -Naur persalys_v14.0.1_ref/CMakeLists.txt persalys_v14.0.1_dev/CMakeLists.t + set(BOOST_ROOT "${BOOST_ROOT_DIR}" CACHE PATH "Boost root directory" FORCE) +endif() +set(Boost_USE_DEBUG_LIBS OFF) # ignore debug libs and -+set(Boost_USE_RELEASE_LIBS ON) # only find release libslist (APPEND PERSALYS_PRIVATE_LIBRARIES ${Boost_LIBRARIES}) ++set(Boost_USE_RELEASE_LIBS ON) # only find release libs find_package (Boost COMPONENTS filesystem locale REQUIRED) -list (APPEND PERSALYS_PRIVATE_LIBRARIES ${Boost_LIBRARIES}) +if (TARGET Boost::filesystem) + set (Boost_LIBRARIES Boost::filesystem Boost::locale) +ENDIF() -+ -+set(Boost_FILESYSTEM_LIBRARY_DEBUG "${BOOST_ROOT_DIR}/lib/boost_filesystem-vc141-mt-x64-1_67.lib" CACHE FILEPATH "" FORCE) -+set(Boost_FILESYSTEM_LIBRARY_RELEASE "${BOOST_ROOT_DIR}/lib/boost_filesystem-vc141-mt-x64-1_67.lib" CACHE FILEPATH "" FORCE) find_package (Python 3.5 COMPONENTS Interpreter Development REQUIRED) list (APPEND PERSALYS_PUBLIC_LIBRARIES ${Python_LIBRARIES}) -diff -Naur persalys_v14.0.1_ref/cmake/FindQwt.cmake persalys_v14.0.1_dev/cmake/FindQwt.cmake ---- persalys_v14.0.1_ref/cmake/FindQwt.cmake 2023-03-31 08:59:27.000000000 +0200 -+++ persalys_v14.0.1_dev/cmake/FindQwt.cmake 2023-05-20 15:44:03.000000000 +0200 -@@ -78,6 +78,7 @@ - endif () - - -+SET(QWT_DEFINITIONS "-DQWT_DLL") - find_library (QWT_LIBRARY - NAMES qwt qwt-qt${QT_DEFAULT_MAJOR_VERSION} - HINTS ${QT_LIBRARY_DIR} diff -Naur persalys_v14.0.1_ref/lib/src/base/CMakeLists.txt persalys_v14.0.1_dev/lib/src/base/CMakeLists.txt --- persalys_v14.0.1_ref/lib/src/base/CMakeLists.txt 2023-03-31 08:59:27.000000000 +0200 +++ persalys_v14.0.1_dev/lib/src/base/CMakeLists.txt 2023-05-22 09:13:05.971858911 +0200