mpi deps for outerloop (#823)

AntaresSimulatorTeam · May 22, 2024 · 520c14b · 520c14b
1 parent e19998e
commit 520c14b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/cpp/benders/outer_loop/CMakeLists.txt b/src/cpp/benders/outer_loop/CMakeLists.txt
@@ -6,12 +6,15 @@
 # Targets
 # ===========================================================================
 
-find_package(TBB REQUIRED CONFIG)
-if (TBB_VERSION_MAJOR VERSION_LESS "2018")
-	message(FATAL_ERROR "Require tbb 2018 or higher.")
-endif()
-if (TBB_VERSION_MAJOR VERSION_GREATER "2020")
-	message(FATAL_ERROR "Require tbb 2018 to 2020.")
+find_package (MPI REQUIRED COMPONENTS C)
+message ("MPI_C_INCLUDE_PATH ${MPI_C_INCLUDE_PATH}")
+message ("MPI_C_INCLUDE_DIRS ${MPI_C_INCLUDE_DIRS}")
+message ("MPI_C_LIBRARIES ${MPI_C_LIBRARIES}")
+
+find_package(MPI REQUIRED)
+
+if(UNIX)
+set(CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
 endif()
 
 add_library (outer_loop_lib STATIC
@@ -26,10 +29,14 @@ add_library (outer_loop_lib STATIC
 target_include_directories (outer_loop_lib
 		PUBLIC
 		${CMAKE_CURRENT_SOURCE_DIR}/include
+	    INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}
 		)
 
 target_link_libraries (outer_loop_lib
 	PUBLIC
+		Boost::mpi
+		MPI::MPI_C
+		Boost::serialization
 		helpers
 		benders_core
 		benders_mpi_core

diff --git a/src/cpp/exe/outer_loop/CMakeLists.txt b/src/cpp/exe/outer_loop/CMakeLists.txt
@@ -20,7 +20,7 @@ set(CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
 endif()
 
 target_link_libraries(outer_loop
-			${PROJECT_NAME}::benders_mpi_core
+			${PROJECT_NAME}::outer_loop_lib
 			factories
 			)