X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/54b039b2cb830d851ebe173aaad0a2bbf3129174..14dcc36f158833d880504001fa1aa67e51db822a:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index ea972cb9a2..01daaf5f15 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -15,8 +15,6 @@ set(EXTRA_DIST
   src/include/surf/maxmin.h
   src/include/surf/random_mgr.h
   src/include/surf/surf.h
-  src/include/surf/surf_resource.h
-  src/include/surf/surf_resource_lmm.h
   src/include/surf/surfxml_parse_values.h
   src/include/surf/trace_mgr.h
   src/include/xbt/win32_ucontext.h
@@ -88,11 +86,11 @@ set(EXTRA_DIST
   src/surf/surf_routing_vivaldi.hpp
   src/surf/surfxml_parse.c
   src/surf/trace_mgr_private.h
-  src/surf/vm_workstation_hl13.hpp
-  src/surf/vm_workstation_interface.hpp
-  src/surf/workstation_clm03.hpp
-  src/surf/workstation_interface.hpp
-  src/surf/workstation_ptask_L07.hpp
+  src/surf/vm_hl13.hpp
+  src/surf/vm_interface.hpp
+  src/surf/host_clm03.hpp
+  src/surf/host_interface.hpp
+  src/surf/host_ptask_L07.hpp
   src/win32/config.h
   src/xbt/automaton/automaton_lexer.yy.c
   src/xbt/automaton/parserPromela.lex
@@ -353,11 +351,11 @@ set(SURF_SRC
   src/surf/surfxml_parse.c
   src/surf/surfxml_parseplatf.c
   src/surf/trace_mgr.c
-  src/surf/vm_workstation_hl13.cpp
-  src/surf/vm_workstation_interface.cpp
-  src/surf/workstation_clm03.cpp
-  src/surf/workstation_interface.cpp
-  src/surf/workstation_ptask_L07.cpp
+  src/surf/vm_hl13.cpp
+  src/surf/vm_interface.cpp
+  src/surf/host_clm03.cpp
+  src/surf/host_interface.cpp
+  src/surf/host_ptask_L07.cpp
   src/xbt/xbt_sg_stubs.c
   )
 
@@ -379,9 +377,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 +507,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}
 )
 
@@ -617,9 +626,10 @@ set(MC_SRC
   src/mc/mc_compare.cpp
   src/mc/mc_diff.cpp
   src/mc/mc_dwarf.cpp
-  src/mc/mc_dwarf_attrnames.h
+  src/mc/mc_dwarf_attrnames.cpp
   src/mc/mc_dwarf_expression.cpp
-  src/mc/mc_dwarf_tagnames.h
+  src/mc/mc_dwarf_tagnames.cpp
+  src/mc/mc_hash.hpp
   src/mc/mc_hash.cpp
   src/mc/mc_ignore.cpp
   src/mc/mcer_ignore.cpp
@@ -653,6 +663,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
@@ -685,6 +696,7 @@ set(headers_to_install
   include/xbt/RngStream.h
   include/xbt/asserts.h
   include/xbt/automaton.h
+  include/xbt/base.h
   include/xbt/config.h
   include/xbt/cunit.h
   include/xbt/dict.h
@@ -1015,9 +1027,9 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/msg/chainsend/CMakeLists.txt
   examples/msg/chord/CMakeLists.txt
   examples/msg/cloud/CMakeLists.txt
+  examples/msg/energy/consumption/CMakeLists.txt
+  examples/msg/energy/onoff/CMakeLists.txt
   examples/msg/energy/pstate/CMakeLists.txt
-  examples/msg/energy/e2/CMakeLists.txt
-  examples/msg/energy/e3/CMakeLists.txt
   examples/msg/exception/CMakeLists.txt
   examples/msg/gpu/CMakeLists.txt
   examples/msg/gtnets/CMakeLists.txt
@@ -1209,7 +1221,6 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/test_prog/prog_gnu_dynlinker.c
   buildtools/Cmake/test_prog/prog_gtnets.cpp
   buildtools/Cmake/test_prog/prog_mutex_timedlock.c
-  buildtools/Cmake/test_prog/prog_printf_null.c
   buildtools/Cmake/test_prog/prog_sem_init.c
   buildtools/Cmake/test_prog/prog_sem_open.c
   buildtools/Cmake/test_prog/prog_sem_timedwait.c
@@ -1218,6 +1229,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++