From dc840674a5973b115e5131907e15c5aa95e885cb Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Wed, 10 Apr 2024 15:10:29 +0200 Subject: [PATCH] bos #41564 [CEA] openturns 1.22 - add PERSALYS f386013d - master head --- products/PERSALYS.pyconf | 6 +- products/compil_scripts/PERSALYS-f386013d.bat | 158 ++++++++++++++++++ products/compil_scripts/openturns-1.22.bat | 32 ++-- products/patches/PERSALYS-f386013d-001.patch | 11 ++ products/patches/PERSALYS-f386013d-002.patch | 22 +++ products/patches/PERSALYS-f386013d-003.patch | 14 ++ products/patches/PERSALYS-f386013d-004.patch | 18 ++ 7 files changed, 244 insertions(+), 17 deletions(-) create mode 100644 products/compil_scripts/PERSALYS-f386013d.bat create mode 100644 products/patches/PERSALYS-f386013d-001.patch create mode 100644 products/patches/PERSALYS-f386013d-002.patch create mode 100644 products/patches/PERSALYS-f386013d-003.patch create mode 100644 products/patches/PERSALYS-f386013d-004.patch diff --git a/products/PERSALYS.pyconf b/products/PERSALYS.pyconf index 1ebaf69..24f82e9 100644 --- a/products/PERSALYS.pyconf +++ b/products/PERSALYS.pyconf @@ -91,7 +91,11 @@ version_f386013d_win : 'openblas', 'pthreads' ] - patches : [] + patches : ['PERSALYS-f386013d-001.patch', + 'PERSALYS-f386013d-002.patch', + 'PERSALYS-f386013d-003.patch', + 'PERSALYS-f386013d-004.patch' + ] } version_v14_1 : diff --git a/products/compil_scripts/PERSALYS-f386013d.bat b/products/compil_scripts/PERSALYS-f386013d.bat new file mode 100644 index 0000000..cd4f0aa --- /dev/null +++ b/products/compil_scripts/PERSALYS-f386013d.bat @@ -0,0 +1,158 @@ +@echo off + +echo ########################################################################## +echo openturns %VERSION% +echo ########################################################################## + +IF NOT DEFINED SAT_DEBUG ( + SET SAT_DEBUG=0 +) + +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 +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_INSTALL_LIBDIR:STRING=lib +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPYTHON_EXECUTABLE=%PYTHONBIN% +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DTBB_ROOT_DIR=%TBB_ROOT_DIR% +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -Dtbb_DIR:PATH=%TBB_ROOT_DIR:\=/% +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DUSE_TBB=OFF +REM libxml2 settings +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2:BOOL=ON +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLIBXML2_INCLUDE_DIR:STRING=%LIBXML2_ROOT_DIR:\=/%/include +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLIBXML2_LIBRARIES:STRING=%LIBXML2_ROOT_DIR:\=/%/lib/libxml2.lib +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLIBXML2_LIBRARY:STRING=%LIBXML2_ROOT_DIR:\=/%/lib/libxml2.lib +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLIBXML2_XMLLINT_EXECUTABLE=%LIBXML2_ROOT_DIR:\=/%/bin/xmllint.exe + + +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPTHREAD_ROOT_DIR=%PTHREAD_ROOT_DIR:\=/% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPTHREAD_INCLUDE_DIR=%PTHREAD_ROOT_DIR:\=/%/include +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPTHREAD_DLL_LIBRARY=%PTHREAD_ROOT_DIR:\=/%/lib/pthreadVC2.dll +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DPTHREAD_LIBRARY=%PTHREAD_ROOT_DIR:\=/%/lib/pthreadVCE2.lib + +REM HDF5 settings +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5:BOOL=ON +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_DIR:PATH=%HDF5_ROOT_DIR:\=/%/cmake/hdf5 +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_INCLUDE_DIRS:PATH=%HDF5_ROOT_DIR:\=/%/include +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DHDF5_USE_STATIC_LIBRARIES:BOOL=OFF + +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DNLOPT_INCLUDE_DIRS:STRING=%NLOPT_ROOT_DIR:\=/%/include +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DNLOPT_LIBRARIES:STRING=%NLOPT_ROOT_DIR:\=/%/bin +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DNLOPT_DIR:STRING=%NLOPT_ROOT_DIR:\=/% + +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCBLAS_DIR=%OPENBLAS_ROOT_DIR:\=/%/share/cmake/OpenBLAS + +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_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% -DUSE_SPHINX=OFF +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DQWT_INCLUDE_DIR=%QWT_ROOT_DIR:\=/%/include +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_SHARED_LIBS:BOOL=ON +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DADAO_ROOT_DIR=%ADAO_ROOT_DIR:\=/% + +REM Boost settings +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_ROOT:PATH=%BOOST_ROOT_DIR:\=/% +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_ADDITIONAL_VERSIONS="1.67.0 1.67" +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBOOST_INCLUDEDIR=%BOOST_ROOT_DIR:\=/%/include/boost-1_67 +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_INCLUDE_DIR=%BOOST_ROOT_DIR:\=/%/include/boost-1_67 +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_NO_BOOST_CMAKE:BOOL=ON +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DBoost_NO_SYSTEM_PATHS:BOOL=ON + +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DGUI_ROOT_DIR=%GUI_ROOT_DIR:\=/% +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DSalomeGUI_DIR=%GUI_ROOT_DIR:\=/%/adm_local/cmake_files +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 +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 + +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 +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 +SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DTBB_ROOT=%TBB_ROOT_DIR:\=/% +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 + +set CMAKE_OPTIONS=%CMAKE_OPTIONS% -DCGNS_INCLUDE_DIR:PATH=%CGNS_ROOT_DIR:\=/%/include +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 + + +if NOT exist "%PRODUCT_INSTALL%" mkdir %PRODUCT_INSTALL% +REM clean BUILD directory +if exist "%BUILD_DIR%" rmdir /Q /S %BUILD_DIR% +mkdir %BUILD_DIR% + +cd %BUILD_DIR% + +set MSBUILDDISABLENODEREUSE=1 + +echo. +echo ********************************************************************* +echo *** %CMAKE_ROOT%\bin\cmake %CMAKE_OPTIONS% %SOURCE_DIR% +echo ********************************************************************* +echo. + +%CMAKE_ROOT%\bin\cmake -G %CMAKE_GENERATOR% %CMAKE_OPTIONS% %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 /p:CharacterSet=Unicode ALL_BUILD.vcxproj + +echo ********************************************************************* +echo. + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 /p:CharacterSet=Unicode ALL_BUILD.vcxproj +if NOT %ERRORLEVEL% == 0 ( + echo ERROR on msbuild ALL_BUILD.vcxproj, please check! + REM exit 2 +) + +echo. +echo ********************************************************************* +echo *** installation... +echo ********************************************************************* +echo. + +msbuild %MAKE_OPTIONS% /p:Configuration=%PRODUCT_BUILD_TYPE% /p:Platform=x64 /p:CharacterSet=Unicode 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.22.bat b/products/compil_scripts/openturns-1.22.bat index 93547b5..acd9708 100644 --- a/products/compil_scripts/openturns-1.22.bat +++ b/products/compil_scripts/openturns-1.22.bat @@ -130,43 +130,43 @@ mkdir cache mkdir cache\pip echo ########################################################################## -echo openturns 1.21 +echo openturns 1.22 echo ########################################################################## SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% -CALL:MODULE_BUILDER openturns "%SOURCE_DIR%\openturns-1.21" "%BUILD_DIR%\openturns" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" +CALL:MODULE_BUILDER openturns "%SOURCE_DIR%\openturns-1.22" "%BUILD_DIR%\openturns" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" set PATH=%PRODUCT_INSTALL%\bin;%PRODUCT_INSTALL%\lib;%PATH% set PYTHONPATH=%PRODUCT_INSTALL%\lib\site-packages;%PYTHONPATH% echo ########################################################################## -echo otagrum 0.8 [SKIPPED] +echo otagrum 0.9 [SKIPPED] echo ########################################################################## REM SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_DOC=OFF -REM CALL:MODULE_BUILDER otagrum "%SOURCE_DIR%\otagrum-0.8" "%BUILD_DIR%\otagrum" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" +REM CALL:MODULE_BUILDER otagrum "%SOURCE_DIR%\otagrum-0.9" "%BUILD_DIR%\otagrum" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" echo ########################################################################## -echo otmorris 0.14 +echo otmorris 0.15 echo ########################################################################## SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% -CALL:MODULE_BUILDER otmorris "%SOURCE_DIR%\otmorris-0.14" "%BUILD_DIR%\otmorris" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" +CALL:MODULE_BUILDER otmorris "%SOURCE_DIR%\otmorris-0.15" "%BUILD_DIR%\otmorris" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" echo ########################################################################## -echo otfftw 0.13 +echo otfftw 0.14 echo ########################################################################## SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% -CALL:MODULE_BUILDER otfftw "%SOURCE_DIR%\otfftw-0.13" "%BUILD_DIR%\otfftw" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" +CALL:MODULE_BUILDER otfftw "%SOURCE_DIR%\otfftw-0.14" "%BUILD_DIR%\otfftw" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" echo ########################################################################## -echo otmixmod 0.14 [SKIPPED] +echo otmixmod 0.16 [SKIPPED] echo ########################################################################## SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% -REM CALL:MODULE_BUILDER otmixmod "%SOURCE_DIR%\otmixmod-0.14" "%BUILD_DIR%\otmixmod" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" +REM CALL:MODULE_BUILDER otmixmod "%SOURCE_DIR%\otmixmod-0.16" "%BUILD_DIR%\otmixmod" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" echo ########################################################################## -echo otrobopt 0.12 +echo otrobopt 0.13 echo ########################################################################## SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_DOC=OFF -CALL:MODULE_BUILDER otrobopt "%SOURCE_DIR%\otrobopt-0.12" "%BUILD_DIR%\otrobopt" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" +CALL:MODULE_BUILDER otrobopt "%SOURCE_DIR%\otrobopt-0.13" "%BUILD_DIR%\otrobopt" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" echo ########################################################################## echo otsubsetinverse 1.10 @@ -175,20 +175,20 @@ SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_DOC=OFF CALL:MODULE_BUILDER otsubsetinverse "%SOURCE_DIR%\otsubsetinverse-1.10" "%BUILD_DIR%\otsubsetinverse" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" echo ########################################################################## -echo otsvm 0.12 +echo otsvm 0.13 echo ########################################################################## SET CMAKE_MODULE_OPTIONS=%CMAKE_OPTIONS% -DBUILD_DOC=OFF -CALL:MODULE_BUILDER otsvm "%SOURCE_DIR%\otsvm-0.12" "%BUILD_DIR%\otsvm" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" +CALL:MODULE_BUILDER otsvm "%SOURCE_DIR%\otsvm-0.13" "%BUILD_DIR%\otsvm" "%PRODUCT_INSTALL%" "%CMAKE_MODULE_OPTIONS%" echo ########################################################################## -echo otfmi 0.15 +echo otfmi 0.16.2 echo ########################################################################## cd %BUILD_DIR% mkdir otfmi set CMAKE_OPTIONS_EXT=%CMAKE_OPTIONS% cd %BUILD_DIR%\otfmi -xcopy %SOURCE_DIR%\otfmi-0.15\* %BUILD_DIR%\otfmi /E /I /Q +xcopy %SOURCE_DIR%\otfmi-0.16.2\* %BUILD_DIR%\otfmi /E /I /Q if NOT %ERRORLEVEL% == 0 ( echo ERROR on xcopy exit 3 diff --git a/products/patches/PERSALYS-f386013d-001.patch b/products/patches/PERSALYS-f386013d-001.patch new file mode 100644 index 0000000..86b3d72 --- /dev/null +++ b/products/patches/PERSALYS-f386013d-001.patch @@ -0,0 +1,11 @@ +--- PERSALYS-f386013d_ref/CMakeLists.txt 2024-04-03 13:36:52.000000000 +0200 ++++ PERSALYS-f386013d_new/CMakeLists.txt 2024-04-10 13:10:40.000000000 +0200 +@@ -64,7 +64,7 @@ + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") + endif () + +-find_package (Boost COMPONENTS locale program_options REQUIRED) ++find_package (Boost COMPONENTS locale filesystem program_options REQUIRED) + list (APPEND PERSALYS_PRIVATE_LIBRARIES ${Boost_LIBRARIES}) + + find_package (Python 3.5 COMPONENTS Interpreter Development REQUIRED) diff --git a/products/patches/PERSALYS-f386013d-002.patch b/products/patches/PERSALYS-f386013d-002.patch new file mode 100644 index 0000000..d3f90fa --- /dev/null +++ b/products/patches/PERSALYS-f386013d-002.patch @@ -0,0 +1,22 @@ +--- PERSALYS-f386013d_ref/lib/src/base/CMakeLists.txt 2024-04-03 13:36:53.000000000 +0200 ++++ PERSALYS-f386013d_new/lib/src/base/CMakeLists.txt 2024-04-10 01:05:14.000000000 +0200 +@@ -204,6 +204,7 @@ + target_compile_definitions (persalysbase PUBLIC PERSALYS_BASE_STATIC) + endif () + ++target_compile_options(persalysbase PUBLIC -DBOOST_ALL_DYN_LINK) + target_include_directories (persalysbase PRIVATE ${Boost_INCLUDE_DIRS}) + target_include_directories (persalysbase PRIVATE ${Python_INCLUDE_DIRS}) + +@@ -225,9 +226,8 @@ + target_link_libraries (persalysbase PRIVATE stdc++fs) + endif () + +-target_link_libraries (persalysbase PUBLIC ${PERSALYS_PUBLIC_LIBRARIES}) +-target_link_libraries (persalysbase PRIVATE ${PERSALYS_PRIVATE_LIBRARIES}) +- ++target_link_libraries (persalysbase PUBLIC "${PERSALYS_PUBLIC_LIBRARIES};${Boost_LIBRARIES};${Boost_FILESYSTEM_LIBRARY_RELEASE}") ++target_link_libraries (persalysbase PRIVATE "${PERSALYS_PRIVATE_LIBRARIES};${Boost_LIBRARIES};${Boost_FILESYSTEM_LIBRARY_RELEASE}") + install (TARGETS persalysbase + RUNTIME DESTINATION ${PERSALYS_BIN_PATH} + LIBRARY DESTINATION ${PERSALYS_LIBRARY_PATH} diff --git a/products/patches/PERSALYS-f386013d-003.patch b/products/patches/PERSALYS-f386013d-003.patch new file mode 100644 index 0000000..35d270d --- /dev/null +++ b/products/patches/PERSALYS-f386013d-003.patch @@ -0,0 +1,14 @@ +--- PERSALYS-f386013d_ref/main/CMakeLists.txt 2024-04-03 13:36:53.000000000 +0200 ++++ PERSALYS-f386013d_new/main/CMakeLists.txt 2024-04-10 14:54:37.739055374 +0200 +@@ -39,7 +39,10 @@ + + if (WIN32) + add_executable (persalys_launcher launcher.cxx) +- target_link_libraries (persalys_launcher PRIVATE Boost::program_options ws2_32) ++ target_compile_options(persalys_launcher PUBLIC -DBOOST_ALL_DYN_LINK) ++ target_link_libraries (persalys_launcher PUBLIC Boost::program_options ws2_32 "${PERSALYS_PRIVATE_LIBRARIES};${Boost_LIBRARIES};${Boost_FILESYSTEM_LIBRARY_RELEASE}") ++ target_link_libraries (persalys_launcher PRIVATE Boost::program_options ws2_32 "${PERSALYS_PRIVATE_LIBRARIES};${Boost_LIBRARIES};${Boost_FILESYSTEM_LIBRARY_RELEASE}") ++ + set_target_properties (persalys_launcher PROPERTIES UNITY_BUILD OFF) + install (TARGETS persalys_launcher DESTINATION bin) + endif () diff --git a/products/patches/PERSALYS-f386013d-004.patch b/products/patches/PERSALYS-f386013d-004.patch new file mode 100644 index 0000000..826310a --- /dev/null +++ b/products/patches/PERSALYS-f386013d-004.patch @@ -0,0 +1,18 @@ +--- PERSALYS-f386013d_ref/main/launcher.cxx 2024-04-03 13:36:53.000000000 +0200 ++++ PERSALYS-f386013d_new/main/launcher.cxx 2024-04-10 14:58:17.794900118 +0200 +@@ -22,13 +22,12 @@ + #define BOOST_PROCESS_USE_STD_FS + #include + #include +- +-#include ++#include + #include + #include + + namespace po = boost::program_options; +-namespace fs = std::filesystem; ++namespace fs = std::experimental::filesystem; + namespace bp = boost::process; + + int main(int argc, char *argv[]) -- 2.39.2