From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 1 Apr 2016 21:50:05 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_13~180^2~12
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a9919f554fd42fdb9a26defe86adbb1c3cfa59bd?hp=-c

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
---

a9919f554fd42fdb9a26defe86adbb1c3cfa59bd
diff --combined tools/cmake/DefinePackages.cmake
index 1a0d668afb,f217ec67e6..05a1e898a0
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -389,7 -389,7 +389,7 @@@ set(S4U_SR
  )
  
  set(SIMGRID_SRC
 -  src/simgrid/sg_config.c
 +  src/simgrid/sg_config.cpp
    src/simgrid/host.cpp
    src/simgrid/util.hpp
    )
@@@ -924,13 -924,6 +924,6 @@@ set(txt_file
  # Add your CMakeLists file here to see your subdir built.
  set(CMAKEFILES_TXT
    examples/java/CMakeLists.txt
-     examples/java/async/CMakeLists.txt
-     examples/java/cloud/CMakeLists.txt
-     examples/java/cloud/migration/CMakeLists.txt
-     examples/java/mutualExclusion/CMakeLists.txt
-     examples/java/pingPong/CMakeLists.txt
-     examples/java/priority/CMakeLists.txt
-     examples/java/tracing/CMakeLists.txt
    examples/msg/CMakeLists.txt
      examples/msg/cloud/CMakeLists.txt
      examples/msg/mc/CMakeLists.txt