And now kill simcalls.py: simix v2 is not completely removed

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

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 3a18f94d4f6199ca6f34a14728ae9559e8986d0b..8074932b4bbf8a0b6ac8d318a2d0c58bf1aad813 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -22,13 +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/simix/popping_accessors.hpp
   src/smpi/colls/coll_tuned_topo.hpp
   src/smpi/colls/colls_private.hpp
   src/smpi/colls/smpi_mvapich2_selector_stampede.hpp
@@ -365,6 +359,7 @@ set(SURF_SRC
 
 set(PLUGINS_SRC
   src/plugins/ProducerConsumer.cpp
+  src/plugins/chaos_monkey.cpp
   src/plugins/host_dvfs.cpp
   src/plugins/host_energy.cpp
   src/plugins/link_energy.cpp
@@ -377,7 +372,6 @@ 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
@@ -415,12 +409,10 @@ set(SIMIX_SRC
   src/kernel/actor/ActorImpl.hpp
   src/kernel/actor/CommObserver.cpp
   src/kernel/actor/CommObserver.hpp
-  src/kernel/actor/MutexObserver.cpp
-  src/kernel/actor/MutexObserver.hpp
   src/kernel/actor/SimcallObserver.cpp
   src/kernel/actor/SimcallObserver.hpp
-
-  ${SIMIX_GENERATED_SRC}
+  src/kernel/actor/SynchroObserver.cpp
+  src/kernel/actor/SynchroObserver.hpp
   )
 
 # Boost context may not be available
@@ -638,6 +630,8 @@ set(MC_SRC
   src/mc/transition/TransitionComm.hpp
   src/mc/transition/TransitionRandom.cpp
   src/mc/transition/TransitionRandom.hpp
+  src/mc/transition/TransitionSynchro.cpp
+  src/mc/transition/TransitionSynchro.hpp
   src/mc/udpor_global.cpp
   src/mc/udpor_global.hpp
   )
@@ -1106,6 +1100,7 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/test_prog/prog_stacksetup.c
   tools/cmake/test_prog/prog_tsan.cpp
   tools/cmake/cross-mingw.cmake
+  tools/simgrid-monkey
   tools/smpi/generate_smpi_defines.pl
   tools/stack-cleaner/as
   tools/stack-cleaner/cc