Merge branch 'master' of https://framagit.org/simgrid/simgrid

diff --combined tools/cmake/DefinePackages.cmake
index 194cb9d,74880bc..d629a24
--- 1/tools/cmake/DefinePackages.cmake
--- 2/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -444,11 -444,13 +444,12 @@@ set(S4U_SR
  )
  
  set(SIMGRID_SRC
+   src/simgrid/Exception.cpp
    src/simgrid/sg_config.cpp
    src/simgrid/util.hpp
    )
  
  set(MSG_SRC
 -  src/msg/instr_msg_task.cpp
    src/msg/msg_global.cpp
    src/msg/msg_gos.cpp
    src/msg/msg_legacy.cpp