From 76bb394034fdaf448d160e785a0247b51a2170a2 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Thu, 21 Nov 2024 16:07:20 +0100 Subject: [PATCH] bos #43653: integration of Persalys 17.0.1 - Windows build --- applications/SALOME-9.14.0-windows.pyconf | 2 +- applications/SALOME-master-windows.pyconf | 2 +- products/PERSALYS.pyconf | 36 +++++++++++++++++++++ products/patches/PERSALYS-v17.0.1-001.patch | 11 +++++++ products/patches/PERSALYS-v17.0.1-002.patch | 23 +++++++++++++ products/patches/PERSALYS-v17.0.1-003.patch | 25 ++++++++++++++ 6 files changed, 97 insertions(+), 2 deletions(-) mode change 100644 => 100755 products/PERSALYS.pyconf create mode 100644 products/patches/PERSALYS-v17.0.1-001.patch create mode 100644 products/patches/PERSALYS-v17.0.1-002.patch create mode 100644 products/patches/PERSALYS-v17.0.1-003.patch diff --git a/applications/SALOME-9.14.0-windows.pyconf b/applications/SALOME-9.14.0-windows.pyconf index 8aec3a9..2867b12 100644 --- a/applications/SALOME-9.14.0-windows.pyconf +++ b/applications/SALOME-9.14.0-windows.pyconf @@ -122,7 +122,7 @@ APPLICATION : pandas : '1.5.3' patsy : '0.5.2' ParaView : {tag:'5.11.0', base: 'no', section: 'version_5_11_0'} - PERSALYS: 'v16.0.1' + PERSALYS: 'v17.0.1' perl : '5.28.1.1' Pillow : '10.2.0' planegcs : '0.18-3cb6890' diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index bee1e07..2cbf403 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -122,7 +122,7 @@ APPLICATION : pandas : '1.5.3' patsy : '0.5.2' ParaView : {tag:'5.11.0', base: 'no', section: 'version_5_11_0'} - PERSALYS: 'v16.0.1' + PERSALYS: 'v17.0.1' perl : '5.28.1.1' Pillow : '10.2.0' planegcs : '0.18-3cb6890' diff --git a/products/PERSALYS.pyconf b/products/PERSALYS.pyconf old mode 100644 new mode 100755 index c116fef..2f42e30 --- a/products/PERSALYS.pyconf +++ b/products/PERSALYS.pyconf @@ -62,6 +62,42 @@ default_win : version_v17_0_1 : { compil_script : 'PERSALYS-v17.0.1.sh' + patches : [] +} + +version_v17_0_1_win : +{ + compil_script : 'PERSALYS-v17.0.1.bat' + depend : ['Python', + 'hdf5', + 'cgns', + 'tbb', + 'nlopt', + 'libxml2', + 'eigen', + 'boost', + 'ADAO', + 'KERNEL', + 'GUI', + 'Sphinx', + 'qwt', + 'qt', + 'ParaView', + 'openturns', + 'FMILibrary', + 'PyFMI', + 'YACS', + 'YDEFX', + 'PY2CPP', + 'CAS', + 'CONFIGURATION', + 'openblas', + 'pthreads' + ] + patches : ['PERSALYS-v17.0.1-001.patch', + 'PERSALYS-v17.0.1-002.patch', + 'PERSALYS-v17.0.1-003.patch' + ] } version_v16_0_1 : diff --git a/products/patches/PERSALYS-v17.0.1-001.patch b/products/patches/PERSALYS-v17.0.1-001.patch new file mode 100644 index 0000000..af785c8 --- /dev/null +++ b/products/patches/PERSALYS-v17.0.1-001.patch @@ -0,0 +1,11 @@ +--- persalys-17.0.1_ref/CMakeLists.txt 2024-10-16 16:22:25.000000000 +0200 ++++ persalys-17.0.1_dev/CMakeLists.txt 2024-11-21 09:57:22.000000000 +0100 +@@ -64,7 +64,7 @@ + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") + endif () + +-find_package (Boost CONFIG COMPONENTS locale program_options) ++find_package (Boost COMPONENTS locale filesystem program_options REQUIRED) + if (Boost_FOUND) + message(STATUS "Found Boost: ${Boost_DIR} (found suitable version \"${Boost_VERSION}\")") + else () diff --git a/products/patches/PERSALYS-v17.0.1-002.patch b/products/patches/PERSALYS-v17.0.1-002.patch new file mode 100644 index 0000000..d9c6bdb --- /dev/null +++ b/products/patches/PERSALYS-v17.0.1-002.patch @@ -0,0 +1,23 @@ +--- persalys-17.0.1_ref/lib/src/base/CMakeLists.txt 2024-10-16 16:22:25.000000000 +0200 ++++ persalys-17.0.1_dev/lib/src/base/CMakeLists.txt 2024-11-21 10:35:00.000000000 +0100 +@@ -207,7 +207,7 @@ + else () + 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}) + +@@ -229,9 +229,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 PRIVATE Boost::locale) ++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} diff --git a/products/patches/PERSALYS-v17.0.1-003.patch b/products/patches/PERSALYS-v17.0.1-003.patch new file mode 100644 index 0000000..76a132d --- /dev/null +++ b/products/patches/PERSALYS-v17.0.1-003.patch @@ -0,0 +1,25 @@ +--- persalys-17.0.1_ref/main/CMakeLists.txt 2024-10-16 16:22:25.000000000 +0200 ++++ persalys-17.0.1_dev/main/CMakeLists.txt 2024-11-21 10:00:48.000000000 +0100 +@@ -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 () +--- persalys-17.0.1_ref/main/launcher.cxx 2024-10-16 16:22:25.000000000 +0200 ++++ persalys-17.0.1_dev/main/launcher.cxx 2024-11-21 11:35:26.000000000 +0100 +@@ -108,7 +108,7 @@ + { + fs::create_directories(pythonuserbase_dir / "Python312" / "site-packages"); + } +- catch (const std::filesystem::filesystem_error &) ++ catch (const fs::filesystem_error &) + { + } + } -- 2.39.2