Merge branch 'develop' into feature/e2e_solvers

CMakeLists.txt

@@ -130,7 +130,7 @@ if (${BUILD_antares_solver})
     #check if antares_solver available before asking for sirius and ortools build
     find_package(Antares QUIET)
     if (NOT Antares_FOUND)
-        message(WARNING "Antares solver not found, will be build")
+        message(WARNING "Antares solver not found, will be built")
         set(BUILD_sirius ON)
         set(BUILD_ortools ON)
         if (NOT Antares_FOUND)
@@ -206,6 +206,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL Linux)
     set(THREADS_PREFER_PTHREAD_FLAG ON)
 endif ()
 find_package(Threads REQUIRED)
+find_package(TBB COMPONENTS tbb) # required for ubuntu 22+
 
 find_package(ZLIB REQUIRED) #Required for CoinUtils
 

src/cpp/benders/benders_core/CMakeLists.txt

@@ -62,6 +62,10 @@ target_link_libraries(benders_core
         antaresXpansion::outer_loop_lib
 )
 
+if (TBB_FOUND)
+    target_link_libraries(benders_core PRIVATE tbb)
+endif ()
+
 install(DIRECTORY include/antares-xpansion
         DESTINATION "include"
 )

src/cpp/exe/full_run/CMakeLists.txt

@@ -34,4 +34,8 @@ target_link_libraries(full_run
         antaresXpansion::helpers
 )
 
+if (TBB_FOUND)
+    target_link_libraries(full_run PRIVATE tbb)
+endif ()
+
 install(TARGETS full_run DESTINATION bin)

src/cpp/lpnamer/problem_modifier/CMakeLists.txt

@@ -65,6 +65,10 @@ target_link_libraries(lp_namer_problem_modifier
         Antares::antares-solver-simulation
 )
 
+if (TBB_FOUND)
+    target_link_libraries(lp_namer_problem_modifier PRIVATE tbb)
+endif ()
+
 add_library(${PROJECT_NAME}::lp_namer_problem_modifier ALIAS lp_namer_problem_modifier)
 
 install(DIRECTORY include/antares-xpansion