Merge branch 'master' into mc-process

[simgrid.git] / buildtools / Cmake / DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index cb222a5..6a07df0 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -129,8 +129,7 @@ set(EXTRA_DIST
   tools/tesh/run_context.h
   tools/tesh/tesh.h
   tools/tesh/generate_tesh
-  examples/smpi/mc/non_deterministic.tesh
-  examples/smpi/mc/send_deterministic.tesh
+  examples/smpi/mc/only_send_deterministic.tesh
   )
 
 set(SMPI_SRC
@@ -604,6 +603,7 @@ set(MC_SRC
   src/mc/mc_unw_vmread.c
   src/mc/mc_mmalloc.h
   src/mc/mc_model_checker.h
+  src/mc/mc_model_checker.c
   src/mc/mc_object_info.h
   src/mc/mc_object_info.c
   src/mc/mc_checkpoint.c
@@ -641,10 +641,19 @@ set(MC_SRC
   src/mc/mc_visited.c
   src/mc/mc_memory_map.h
   src/mc/memory_map.c
+  src/mc/mc_client.c
+  src/mc/mc_client_api.c
+  src/mc/mc_client.h
+  src/mc/mc_protocol.h
+  src/mc/mc_protocol.c
+  src/mc/mc_server.cpp
+  src/mc/mc_server.h
+  src/mc/mc_smx.h
+  src/mc/mc_smx.c
   )
 
 set(MC_SIMGRID_MC_SRC
-  src/mc/simgrid_mc.c)
+  src/mc/simgrid_mc.cpp)
 
 set(headers_to_install
   include/instr/instr.h
@@ -1007,7 +1016,7 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/msg/chainsend/CMakeLists.txt
   examples/msg/chord/CMakeLists.txt
   examples/msg/cloud/CMakeLists.txt
-  examples/msg/energy/e1/CMakeLists.txt
+  examples/msg/energy/pstate/CMakeLists.txt
   examples/msg/energy/e2/CMakeLists.txt
   examples/msg/energy/e3/CMakeLists.txt
   examples/msg/exception/CMakeLists.txt