Merge branch 'depencencies' of https://framagit.org/simgrid/simgrid into depencencies

diff --cc include/simgrid/s4u/Activity.hpp
index da23b82,ccdcea1..76d41c0
--- 1/include/simgrid/s4u/Activity.hpp
--- 2/include/simgrid/s4u/Activity.hpp
+++ b/include/simgrid/s4u/Activity.hpp
@@@ -12,11 -12,8 +12,10 @@@
  #include <simgrid/forward.h>
  #include <string>
  #include <vector>
- #include <xbt/log.hpp>
  #include <xbt/signal.hpp>
  
 +XBT_LOG_EXTERNAL_CATEGORY(s4u_activity);
 +
  namespace simgrid {
  namespace s4u {