Merge branch 'local changes'

diff --cc examples/cpp/CMakeLists.txt
index 0b0ef35,fc3d688..393f3f8
--- 1/examples/s4u/CMakeLists.txt
--- 2/examples/cpp/CMakeLists.txt
+++ b/examples/cpp/CMakeLists.txt
@@@ -178,16 -178,16 +178,16 @@@ endforeach(
  
  # ns3-tests
  if(SIMGRID_HAVE_NS3)
 -  ADD_TESH_FACTORIES(s4u-network-ns3 "thread;ucontext;raw;boost"
 +  ADD_TESH_FACTORIES(s4u-network-ns3 "*"
-                                      --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/s4u
-                                      --setenv bindir=${CMAKE_BINARY_DIR}/examples/s4u
+                                      --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/cpp
+                                      --setenv bindir=${CMAKE_BINARY_DIR}/examples/cpp
                                       --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms
-                                      ${CMAKE_HOME_DIRECTORY}/examples/s4u/network-ns3/s4u-network-ns3.tesh)
+                                      ${CMAKE_HOME_DIRECTORY}/examples/cpp/network-ns3/s4u-network-ns3.tesh)
 -  ADD_TESH_FACTORIES(s4u-network-ns3-wifi "thread;ucontext;raw;boost"
 +  ADD_TESH_FACTORIES(s4u-network-ns3-wifi "*"
-                                      --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/s4u
-                                      --setenv bindir=${CMAKE_BINARY_DIR}/examples/s4u
+                                      --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/cpp
+                                      --setenv bindir=${CMAKE_BINARY_DIR}/examples/cpp
                                       --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms
-                                      ${CMAKE_HOME_DIRECTORY}/examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.tesh)
+                                      ${CMAKE_HOME_DIRECTORY}/examples/cpp/network-ns3-wifi/s4u-network-ns3-wifi.tesh)
  endif()
  # Examples not accepting factories
  ##################################