X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ae0b46319f23797ae320fa36ca7b6f7cbb891ed..cd69f8c66886ae218c6a9b38125b27fe157e6bb2:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index fca1fb251f..8da0636620 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -31,10 +31,9 @@ set(EXTRA_DIST
   src/simix/simcalls.py
   src/simix/simcalls_generated_args_getter_setter.h
   src/simix/simcalls_generated_body.c
-  src/simix/simcalls_generated_case.c
-  src/simix/simcalls_generated_enum.h
+  src/simix/smx_popping_generated.c
+  src/simix/smx_popping_generated.h
   src/simix/simcalls_generated_res_getter_setter.h
-  src/simix/simcalls_generated_string.c
   src/simix/smx_host_private.h
   src/simix/smx_io_private.h
   src/simix/smx_network_private.h
@@ -210,6 +209,7 @@ set(SMPI_SRC
   src/smpi/colls/bcast-flattree.c
   src/smpi/colls/bcast-ompi-pipeline.c
   src/smpi/colls/bcast-ompi-split-bintree.c
+  src/smpi/colls/bcast-mvapich-smp.c
   src/smpi/colls/bcast-scatter-LR-allgather.c
   src/smpi/colls/bcast-scatter-rdb-allgather.c
   src/smpi/colls/coll_tuned_topo.c
@@ -250,21 +250,9 @@ set(SMPI_SRC
   src/smpi/smpi_replay.c
   src/smpi/smpi_rma.c
   src/smpi/smpi_topo.c
+  src/smpi/smpi_f77.c
   )
 
-if(SMPI_FORTRAN)
-  set(SMPI_SRC
-    ${SMPI_SRC}
-    src/smpi/smpi_f77.c
-    )
-else()
-  set(EXTRA_DIST
-    ${EXTRA_DIST}
-    src/smpi/smpi_f77.c
-  )
-endif()
-
-
 set(XBT_SRC
   src/xbt/RngStream.c
   src/xbt/automaton/automaton.c
@@ -371,6 +359,9 @@ set(SURF_SRC
   src/xbt/xbt_sg_stubs.c
   )
 
+set(SIMIX_GENERATED_SRC
+  src/simix/smx_popping_generated.c
+  )
 set(SIMIX_SRC
   src/simix/smx_context.c
   src/simix/smx_context_base.c
@@ -386,6 +377,7 @@ set(SIMIX_SRC
   src/simix/smx_synchro.c
   src/simix/smx_user.c
   src/simix/smx_vm.c
+  ${SIMIX_GENERATED_SRC}
   )
 
 set(SIMGRID_SRC
@@ -410,23 +402,6 @@ set(MSG_SRC
   src/msg/msg_vm.c
   )
 
-#* ****************************************************************************************** *#
-#* TUTORIAL: New API                                                                          *#
-
-set(MSG_SRC
-  ${MSG_SRC}
-  src/msg/msg_new_api.c
-  )
-set(EXTRA_DIST
-  ${EXTRA_DIST}
-  src/simix/smx_new_api_private.h
-  )
-set(SIMIX_SRC
-  ${SIMIX_SRC}
-  src/simix/smx_new_api.c
-)
-#* ****************************************************************************************** *#
-
 set(SIMDAG_SRC
   src/simdag/instr_sd_task.c
   src/simdag/sd_daxloader.c
@@ -614,6 +589,7 @@ set(MC_SRC
   src/mc/mc_page_snapshot.cpp
   src/mc/mc_comm_determinism.c
   src/mc/mc_compare.cpp
+  src/mc/mc_config.c
   src/mc/mc_diff.c
   src/mc/mc_dwarf.c
   src/mc/mc_dwarf_attrnames.h
@@ -622,6 +598,7 @@ set(MC_SRC
   src/mc/mc_global.c
   src/mc/mc_hash.c
   src/mc/mc_ignore.c
+  src/mc/mc_interface.h
   src/mc/mc_liveness.c
   src/mc/mc_member.c
   src/mc/mc_memory.c
@@ -1029,6 +1006,7 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/simdag/scheduling/CMakeLists.txt
   examples/smpi/CMakeLists.txt
   examples/smpi/smpi_msg_masterslave/CMakeLists.txt
+  examples/smpi/replay_multiple/CMakeLists.txt
   examples/smpi/MM/CMakeLists.txt
   examples/smpi/energy/CMakeLists.txt
   examples/smpi/energy/f77/CMakeLists.txt
@@ -1038,6 +1016,8 @@ set(EXAMPLES_CMAKEFILES_TXT
 
 set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/bug-17132/CMakeLists.txt
+  teshsuite/java/CMakeLists.txt
+  teshsuite/java/sleep_host_off/CMakeLists.txt
   teshsuite/mc/CMakeLists.txt
   teshsuite/mc/dwarf/CMakeLists.txt
   teshsuite/mc/dwarf_expression/CMakeLists.txt
@@ -1079,6 +1059,7 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/smpi/shared/CMakeLists.txt
   teshsuite/smpi/struct/CMakeLists.txt
   teshsuite/smpi/vector/CMakeLists.txt
+  teshsuite/smpi/isp/umpire/CMakeLists.txt
   teshsuite/smpi/mpich3-test/CMakeLists.txt
   teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
   teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
@@ -1240,6 +1221,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/syscoord/median_p2psim.xml
   examples/platforms/torus_cluster.xml
   examples/platforms/two_hosts_platform.xml
+  examples/platforms/two_hosts_platform_shared.xml
   examples/platforms/two_hosts_platform_with_availability.xml
   examples/platforms/two_hosts_platform_with_availability_included.xml
   examples/platforms/two_peers.xml