From: Nabil Ghodbane Date: Thu, 19 May 2022 14:41:09 +0000 (+0200) Subject: PERSALYS : implement patch à la EDF - Test X-Git-Tag: V9_9_0~21 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e2f8efc8883dea398c702e33ab3a29c235eaf9be;p=tools%2Fsat_salome.git PERSALYS : implement patch à la EDF - Test --- diff --git a/products/PERSALYS.pyconf b/products/PERSALYS.pyconf index ac12d8d..7e81150 100644 --- a/products/PERSALYS.pyconf +++ b/products/PERSALYS.pyconf @@ -61,7 +61,8 @@ default_win : version_v12_0 : { - patches : ['PERSALYS-v12-001.patch', 'PERSALYS-v12-002.patch'] + patches : ['PERSALYS-v12-003.patch'] +# patches : ['PERSALYS-v12-001.patch', 'PERSALYS-v12-002.patch'] } version_v11_0 : diff --git a/products/patches/PERSALYS-v12-003.patch b/products/patches/PERSALYS-v12-003.patch new file mode 100644 index 0000000..2670402 --- /dev/null +++ b/products/patches/PERSALYS-v12-003.patch @@ -0,0 +1,56 @@ +--- persalys_v12.0_ref/CMakeLists.txt 2022-03-24 11:47:43.000000000 +0100 ++++ persalys_v12.0_new/CMakeLists.txt 2022-05-19 16:39:19.503355921 +0200 +@@ -6,7 +6,7 @@ + option (USE_SALOME "use salome" ON) + option (USE_OTFMI "use otfmi" ON) + option (USE_OTMORRIS "use otmorris" ON) +-option (USE_SPHINX "use sphinx" ON) ++option (USE_SPHINX "use sphinx" OFF) + option (USE_COTIRE "Use cotire for unity builds" OFF) + option (USE_PARAVIEW "use ParaView" ON) + set (PERSALYS_QT_VERSION 5 CACHE STRING "Qt version") +@@ -63,9 +63,11 @@ + list (APPEND PERSALYS_DEFINITIONS "-DPERSALYS_STATIC -DPYINTERP_STATIC -DPYCONSOLE_STATIC") + endif () + +-find_package (Boost COMPONENTS filesystem locale REQUIRED) ++find_package (Boost COMPONENTS filesystem locale regex REQUIRED) ++unset(Boost_USE_DEBUG_RUNTIME) + if (TARGET Boost::filesystem) + set (Boost_LIBRARIES Boost::filesystem Boost::locale) ++ message(">>>>>>>>>>>>>>>>> ${Boost_LIBRARIES}") + endif () + include_directories (${Boost_INCLUDE_DIRS}) + +@@ -94,7 +96,7 @@ + find_package (Qwt 6 REQUIRED) + + if (USE_PARAVIEW) +- find_package (ParaView 5.8 CONFIG) ++ find_package (ParaView 5.9 CONFIG) + if (ParaView_FOUND) + message(STATUS "Found ParaView: ${ParaView_DIR} (found version \"${ParaView_VERSION}\")") + list (APPEND PERSALYS_DEFINITIONS -DPERSALYS_HAVE_PARAVIEW) +@@ -103,13 +105,21 @@ + + endif () + +-if (USE_SALOME) ++if (USE_SALOME)#${_BOOST_QUIET} ++ #set(__boost_comp_nv "thread") # filesystem ++ ++ #find_package(boost_${__boost_comp_nv} "1.71.0" EXACT CONFIG QUIET REQUIRED HINTS "/home/H87074/salome/TMP/SALOME-9.9.0-DB09-SRC/INSTALL/boost/lib/cmake") ++ set(PERSALYS_Boost_LIBRARIES ${Boost_LIBRARIES}) ++ unset(Boost_LIBRARIES) + find_package (SalomeKERNEL CONFIG) + find_package (Qt5WebEngine CONFIG) + find_package (Qt5WebEngineWidgets CONFIG) + find_package (SalomeGUI CONFIG) + find_package (SalomeYACS CONFIG) ++ set(Boost_LIBRARIES ${Boost_LIBRARIES} ${PERSALYS_Boost_LIBRARIES}) ++ unset(PERSALYS_Boost_LIBRARIES) + if (SalomeYACS_FOUND) ++ message("FOUND Yacs.") + list (APPEND PERSALYS_DEFINITIONS ${YACS_DEFINITIONS}) + list (APPEND PERSALYS_DEFINITIONS -DPERSALYS_HAVE_YACS) + include_directories (${YACS_INCLUDE_DIRS})