Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/e2e_solvers' into featur…
Browse files Browse the repository at this point in the history
…e/e2e_solvers
  • Loading branch information
a-zakir committed Nov 22, 2024
2 parents f6d3033 + 714e517 commit 4bfa357
Show file tree
Hide file tree
Showing 8 changed files with 13,623 additions and 14,177 deletions.
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down
4 changes: 4 additions & 0 deletions src/cpp/benders/benders_core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
4 changes: 4 additions & 0 deletions src/cpp/exe/full_run/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 4 additions & 0 deletions src/cpp/lpnamer/problem_modifier/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 4bfa357

Please sign in to comment.