X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d4febdfcc0fd8218e5535921ba357294567a6f3b..16dfaaadf3875cfbad8847ae4a52af1034b77b69:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 16afa9a68e..bd9de442b3 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -254,7 +254,12 @@ set(SMPI_SRC
   src/smpi/include/smpi_topo.hpp
   src/smpi/include/smpi_win.hpp
   src/smpi/plugins/sampi_loadbalancer.cpp
-  src/smpi/plugins/sampi_pampi.cpp
+  src/smpi/plugins/ampi/ampi.cpp
+  src/smpi/plugins/ampi/ampi.hpp
+  src/smpi/plugins/ampi/instr_ampi.cpp
+  src/smpi/plugins/ampi/instr_ampi.hpp
+  src/smpi/plugins/load_balancer/LoadBalancer.cpp
+  src/smpi/plugins/load_balancer/load_balancer.hpp
   src/surf/network_smpi.cpp
   src/surf/network_ib.cpp
   )
@@ -430,6 +435,7 @@ set(S4U_SRC
   src/s4u/s4u_Engine.cpp
   src/s4u/s4u_Exec.cpp
   src/s4u/s4u_Host.cpp
+  src/s4u/s4u_Io.cpp
   src/s4u/s4u_Link.cpp
   src/s4u/s4u_Mailbox.cpp
   src/s4u/s4u_Mutex.cpp
@@ -660,7 +666,6 @@ set(MC_SRC
 set(MC_SIMGRID_MC_SRC  src/mc/checker/simgrid_mc.cpp)
 
 set(headers_to_install
-
   include/simgrid_config.h
   include/simgrid/actor.h
   include/simgrid/barrier.h
@@ -673,7 +678,6 @@ set(headers_to_install
   include/simgrid/plugins/load.h
   include/simgrid/plugins/load_balancer.h
   include/simgrid/smpi/replay.hpp
-  include/simgrid/smpi/sampi.h
   include/simgrid/instr.h
   include/simgrid/mailbox.h
   include/simgrid/msg.h
@@ -697,6 +701,7 @@ set(headers_to_install
   include/simgrid/s4u/Engine.hpp
   include/simgrid/s4u/Exec.hpp
   include/simgrid/s4u/Host.hpp
+  include/simgrid/s4u/Io.hpp
   include/simgrid/s4u/Link.hpp
   include/simgrid/s4u/Mailbox.hpp
   include/simgrid/s4u/Mutex.hpp
@@ -723,6 +728,7 @@ set(headers_to_install
   include/simgrid/kernel/routing/VivaldiZone.hpp
 
   include/smpi/mpi.h
+  include/smpi/sampi.h
   include/smpi/smpi.h
   include/smpi/smpi_main.h
   include/smpi/smpi_helpers.h
@@ -871,7 +877,6 @@ set(DOC_SOURCES
   doc/doxygen/application.doc
   doc/doxygen/community.doc
   doc/doxygen/deployment.doc
-  doc/doxygen/examples.doc
   doc/doxygen/footer.html
   doc/doxygen/getting_started.doc
   doc/doxygen/header.html
@@ -948,7 +953,6 @@ set(DOC_TOOLS
 
 # these files get copied automatically to the html documentation
 set(DOC_IMG
-  ${CMAKE_HOME_DIRECTORY}/doc/sc3-description.png
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/AS_hierarchy.png
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/eclipseScreenShot.png
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg
@@ -1004,6 +1008,7 @@ set(CMAKEFILES_TXT
     examples/smpi/smpi_msg_masterslave/CMakeLists.txt
     examples/smpi/replay_multiple/CMakeLists.txt
     examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
+    examples/smpi/load_balancer_replay/CMakeLists.txt
     examples/smpi/energy/f77/CMakeLists.txt
     examples/smpi/energy/f90/CMakeLists.txt