From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Tue, 5 Mar 2019 08:22:35 +0000 (+0100)
Subject: Merge branch 'master' of https://framagit.org/simgrid/simgrid
X-Git-Tag: v3_22~180
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4d02714ee138a3bd9b02e0064b7a2aa26407e9e8?hp=-c

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

4d02714ee138a3bd9b02e0064b7a2aa26407e9e8
diff --combined tools/cmake/DefinePackages.cmake
index 194cb9d435,74880bc966..d629a2482d
--- a/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