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

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 790a06d452..75b1d8aaad 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
@@ -636,11 +630,14 @@ set(MC_SRC
   )
 
 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
@@ -770,17 +767,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}
@@ -996,7 +986,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