Merge branch 'hypervisor' into surf++

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

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index cdef08e..3902cd1 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -328,6 +328,7 @@ set(SURF_SRC
   src/surf/trace_mgr.c
   src/surf/workstation.cpp
   src/surf/workstation_ptask_L07.cpp
+  src/surf/vm_workstation.cpp
   src/xbt/xbt_sg_stubs.c
   )
 
@@ -345,6 +346,7 @@ set(SIMIX_SRC
   src/simix/smx_smurf.c
   src/simix/smx_synchro.c
   src/simix/smx_user.c
+  src/simix/smx_vm.c
   )
 
 set(SIMGRID_SRC
@@ -386,17 +388,6 @@ set(SIMIX_SRC
 )
 #* ****************************************************************************************** *#
 
-#* ****************************************************************************************** *#
-#* TUTORIAL: New Model                                                                        *#
-
-set(SURF_SRC
-  ${SURF_SRC}
-  )
-set(EXTRA_DIST
-  ${EXTRA_DIST}
-  )
-#* ****************************************************************************************** *#
-
 set(SIMDAG_SRC
   src/simdag/instr_sd_task.c
   src/simdag/sd_daxloader.c