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

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 79bc327587..79652e1ad5 100644
--- 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
@@ -540,13 +539,8 @@ set(JTRACE_JAVA_SRC
   src/bindings/java/org/simgrid/trace/Trace.java
 )
 
-if(HAVE_TRACING)
-  list(APPEND JMSG_C_SRC ${JTRACE_C_SRC})
-  list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC})
-else()
-  list(APPEND EXTRA_DIST ${JTRACE_C_SRC})
-  list(APPEND EXTRA_DIST ${JTRACE_JAVA_SRC})
-endif()
+list(APPEND JMSG_C_SRC ${JTRACE_C_SRC})
+list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC})
 
 set(LUA_SRC
   src/bindings/lua/lua_comm.c
@@ -574,10 +568,10 @@ set(TRACING_SRC
   )
 
 set(JEDULE_SRC
-  include/instr/jedule/jedule_events.h
-  include/instr/jedule/jedule_output.h
-  include/instr/jedule/jedule_platform.h
-  include/instr/jedule/jedule_sd_binding.h
+  include/simgrid/jedule/jedule_events.h
+  include/simgrid/jedule/jedule_output.h
+  include/simgrid/jedule/jedule_platform.h
+  include/simgrid/jedule/jedule_sd_binding.h
   src/instr/jedule/jedule_events.c
   src/instr/jedule/jedule_output.c
   src/instr/jedule/jedule_platform.c
@@ -599,8 +593,12 @@ set(MC_SRC
   src/mc/mc_forward.h
   src/mc/mc_process.h
   src/mc/mc_process.c
+  src/mc/mc_unw.h
+  src/mc/mc_unw.c
+  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
@@ -610,6 +608,7 @@ set(MC_SRC
   src/mc/mc_page_store.cpp
   src/mc/mc_page_snapshot.cpp
   src/mc/mc_comm_pattern.h
+  src/mc/mc_comm_pattern.c
   src/mc/mc_comm_determinism.c
   src/mc/mc_compare.cpp
   src/mc/mc_diff.c
@@ -619,6 +618,7 @@ set(MC_SRC
   src/mc/mc_dwarf_tagnames.h
   src/mc/mc_hash.c
   src/mc/mc_ignore.c
+  src/mc/mc_ignore.h
   src/mc/mc_interface.h
   src/mc/mc_liveness.h
   src/mc/mc_location.h
@@ -638,17 +638,29 @@ 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
-  include/msg/datatypes.h
   include/msg/msg.h
-  include/simdag/datatypes.h
+  include/msg/datatypes.h
   include/simdag/simdag.h
+  include/simdag/datatypes.h
+  
+  include/simgrid/instr.h
+  include/simgrid/msg.h
+  include/simgrid/simdag.h
   include/simgrid.h
   include/simgrid/datatypes.h
   include/simgrid/modelchecker.h
@@ -778,17 +790,10 @@ if(enable_smpi)
     )
 endif()
 
-if(${HAVE_TRACING})
-  set(simgrid_sources
+set(simgrid_sources
     ${simgrid_sources}
     ${TRACING_SRC}
     )
-else()
-  set(EXTRA_DIST
-    ${EXTRA_DIST}
-    ${TRACING_SRC}
-    )
-endif()
 
 set(simgrid_sources
   ${simgrid_sources}
@@ -1004,7 +1009,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