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

[simgrid.git] / buildtools / Cmake / DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 9efb8bf..289aadb 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -379,9 +379,20 @@ set(SIMIX_SRC
   src/simix/smx_synchro.c
   src/simix/smx_vm.c
   src/simix/popping.c
+
   ${SIMIX_GENERATED_SRC}
   )
 
+if (HAVE_BOOST_CONTEXT)
+  set(SIMIX_SRC
+      ${SIMIX_SRC}
+      src/simix/smx_context_boost.cpp)
+else()
+  set(EXTRA_DIST
+      ${EXTRA_DIST}
+      src/simix/smx_context_boost.cpp)
+endif()
+
 set(SIMGRID_SRC
   src/simgrid/sg_config.c
   )
@@ -498,8 +509,8 @@ set(JMSG_C_SRC
 )
 
 set(JSURF_C_SRC
-  src/bindings/java/surfJAVA_wrap.cxx
-  src/bindings/java/surfJAVA_wrap.h
+  src/bindings/java/org/simgrid/surf/surfJAVA_wrap.cxx
+  src/bindings/java/org/simgrid/surf/surfJAVA_wrap.h
   ${JSURF_JAVA_C_SRC}
 )
 
@@ -606,6 +617,8 @@ set(MC_SRC
   src/mc/mc_checkpoint.cpp
   src/mc/mc_snapshot.h
   src/mc/mc_snapshot.cpp
+  src/mc/RegionSnapshot.cpp
+  src/mc/RegionSnapshot.hpp
   src/mc/PageStore.hpp
   src/mc/PageStore.cpp
   src/mc/mc_page_snapshot.cpp
@@ -618,6 +631,7 @@ set(MC_SRC
   src/mc/mc_dwarf_attrnames.h
   src/mc/mc_dwarf_expression.cpp
   src/mc/mc_dwarf_tagnames.h
+  src/mc/mc_hash.hpp
   src/mc/mc_hash.cpp
   src/mc/mc_ignore.cpp
   src/mc/mcer_ignore.cpp
@@ -651,6 +665,7 @@ set(MC_SRC
   src/mc/mc_smx.cpp
   src/mc/mc_xbt.hpp
   src/mc/mc_xbt.cpp
+  src/mc/mc_exit.h
   )
 
 set(MC_SIMGRID_MC_SRC
@@ -1014,8 +1029,9 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/msg/chord/CMakeLists.txt
   examples/msg/cloud/CMakeLists.txt
   examples/msg/energy/pstate/CMakeLists.txt
-  examples/msg/energy/e2/CMakeLists.txt
+  examples/msg/energy/consumption/CMakeLists.txt
   examples/msg/energy/e3/CMakeLists.txt
+  examples/msg/energy/onoff/CMakeLists.txt
   examples/msg/exception/CMakeLists.txt
   examples/msg/gpu/CMakeLists.txt
   examples/msg/gtnets/CMakeLists.txt
@@ -1216,6 +1232,7 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/test_prog/prog_stacksetup.c
   buildtools/Cmake/test_prog/prog_thread_storage.c
   buildtools/Cmake/test_prog/prog_vsnprintf.c
+  buildtools/Cross/Mingw.cmake
   tools/stack-cleaner/as
   tools/stack-cleaner/cc
   tools/stack-cleaner/c++