1 --- persalys_v12.0_ref/CMakeLists.txt 2022-03-24 11:47:43.000000000 +0100
2 +++ persalys_v12.0_new/CMakeLists.txt 2022-05-19 16:39:19.503355921 +0200
4 option (USE_SALOME "use salome" ON)
5 option (USE_OTFMI "use otfmi" ON)
6 option (USE_OTMORRIS "use otmorris" ON)
7 -option (USE_SPHINX "use sphinx" ON)
8 +option (USE_SPHINX "use sphinx" OFF)
9 option (USE_COTIRE "Use cotire for unity builds" OFF)
10 option (USE_PARAVIEW "use ParaView" ON)
11 set (PERSALYS_QT_VERSION 5 CACHE STRING "Qt version")
13 list (APPEND PERSALYS_DEFINITIONS "-DPERSALYS_STATIC -DPYINTERP_STATIC -DPYCONSOLE_STATIC")
16 -find_package (Boost COMPONENTS filesystem locale REQUIRED)
17 +find_package (Boost COMPONENTS filesystem locale regex REQUIRED)
18 +unset(Boost_USE_DEBUG_RUNTIME)
19 if (TARGET Boost::filesystem)
20 set (Boost_LIBRARIES Boost::filesystem Boost::locale)
21 + message(">>>>>>>>>>>>>>>>> ${Boost_LIBRARIES}")
23 include_directories (${Boost_INCLUDE_DIRS})
26 find_package (Qwt 6 REQUIRED)
29 - find_package (ParaView 5.8 CONFIG)
30 + find_package (ParaView 5.9 CONFIG)
32 message(STATUS "Found ParaView: ${ParaView_DIR} (found version \"${ParaView_VERSION}\")")
33 list (APPEND PERSALYS_DEFINITIONS -DPERSALYS_HAVE_PARAVIEW)
39 +if (USE_SALOME)#${_BOOST_QUIET}
40 + #set(__boost_comp_nv "thread") # filesystem
42 + #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")
43 + set(PERSALYS_Boost_LIBRARIES ${Boost_LIBRARIES})
44 + unset(Boost_LIBRARIES)
45 find_package (SalomeKERNEL CONFIG)
46 find_package (Qt5WebEngine CONFIG)
47 find_package (Qt5WebEngineWidgets CONFIG)
48 find_package (SalomeGUI CONFIG)
49 find_package (SalomeYACS CONFIG)
50 + set(Boost_LIBRARIES ${Boost_LIBRARIES} ${PERSALYS_Boost_LIBRARIES})
51 + unset(PERSALYS_Boost_LIBRARIES)
53 + message("FOUND Yacs.")
54 list (APPEND PERSALYS_DEFINITIONS ${YACS_DEFINITIONS})
55 list (APPEND PERSALYS_DEFINITIONS -DPERSALYS_HAVE_YACS)
56 include_directories (${YACS_INCLUDE_DIRS})