Merge branch 'add_wait_for_to_py_comm_binding' into 'master'

[simgrid.git] / tools / cmake / DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 87ca7ac..a78c0a6 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -22,12 +22,7 @@ set(EXTRA_DIST
   src/dag/dax.dtd
   src/dag/dax_dtd.c
   src/dag/dax_dtd.h
-  src/simix/simcalls.in
-  src/simix/simcalls.py
   src/simix/popping_private.hpp
-  src/simix/popping_bodies.cpp
-  src/simix/popping_generated.cpp
-  src/simix/popping_enum.hpp
   src/smpi/colls/coll_tuned_topo.hpp
   src/smpi/colls/colls_private.hpp
   src/smpi/colls/smpi_mvapich2_selector_stampede.hpp
@@ -377,9 +372,7 @@ set(PLUGINS_SRC
   src/plugins/vm/VmLiveMigration.hpp
   )
 
-set(SIMIX_GENERATED_SRC   src/simix/popping_generated.cpp  )
 set(SIMIX_SRC
-  src/kernel/future.cpp
   src/simix/libsmx.cpp
   src/simix/smx_context.cpp
   src/kernel/context/Context.cpp
@@ -393,6 +386,8 @@ set(SIMIX_SRC
   src/simix/popping.cpp
   src/kernel/activity/ActivityImpl.cpp
   src/kernel/activity/ActivityImpl.hpp
+  src/kernel/activity/BarrierImpl.cpp
+  src/kernel/activity/BarrierImpl.hpp
   src/kernel/activity/ConditionVariableImpl.cpp
   src/kernel/activity/ConditionVariableImpl.hpp
   src/kernel/activity/CommImpl.cpp
@@ -419,8 +414,6 @@ set(SIMIX_SRC
   src/kernel/actor/SimcallObserver.hpp
   src/kernel/actor/SynchroObserver.cpp
   src/kernel/actor/SynchroObserver.hpp
-
-  ${SIMIX_GENERATED_SRC}
   )
 
 # Boost context may not be available
@@ -668,7 +661,6 @@ set(headers_to_install
   include/simgrid/simix.hpp
   include/simgrid/kernel/ProfileBuilder.hpp
   include/simgrid/kernel/Timer.hpp
-  include/simgrid/kernel/future.hpp
   include/simgrid/disk.h
   include/simgrid/host.h
   include/simgrid/link.h
@@ -1036,7 +1028,7 @@ set(CMAKEFILES_TXT
   teshsuite/surf/CMakeLists.txt
   teshsuite/xbt/CMakeLists.txt
 
-  teshsuite/smpi/isp/umpire/CMakeLists.txt
+  teshsuite/smpi/MBI/CMakeLists.txt
   teshsuite/smpi/mpich3-test/CMakeLists.txt
   teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
   teshsuite/smpi/mpich3-test/coll/CMakeLists.txt