From: Zitagcc <toufik.boubehziz@inria.fr>
Date: Mon, 2 Oct 2017 16:02:10 +0000 (+0200)
Subject: Merge branch 'master' into async-wait
X-Git-Tag: v3_17~48^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a001b13d7aa269a90f035f58c71778c6812b07f6

Merge branch 'master' into async-wait
---

a001b13d7aa269a90f035f58c71778c6812b07f6
diff --cc examples/s4u/CMakeLists.txt
index d3ce9a6a11,19857060f3..0ee6b1e500
--- a/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@@ -31,9 -31,7 +31,8 @@@ endforeach(
  
  set(examples_src  ${examples_src}                                                                          PARENT_SCOPE)
  set(tesh_files    ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/s4u-app-bittorrent.tesh
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u-dht-chord.tesh
                                    ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/s4u-dht-chord.tesh
 +                                  ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/s4u-async-wait.tesh
                                    ${CMAKE_CURRENT_SOURCE_DIR}/async-waitany/s4u-async-waitany.tesh
                                    ${CMAKE_CURRENT_SOURCE_DIR}/async-waitall/s4u-async-waitall.tesh         PARENT_SCOPE)
  set(xml_files     ${xml_files}    ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u-actions-comm-split_d.xml