move Cpu resource definition where it belongs

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

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index ef3d323..15a8cf1 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -35,7 +35,6 @@ set(EXTRA_DIST
   src/smpi/smpi_main.c
   src/smpi/smpi_replay_main.cpp
   src/surf/cpu_cas01.hpp
-  src/surf/cpu_interface.hpp
   src/surf/cpu_ti.hpp
   src/surf/network_cm02.hpp
   src/surf/network_constant.hpp
@@ -124,6 +123,7 @@ set(SMPI_SRC
   src/smpi/include/smpi_info.hpp
   src/smpi/include/smpi_keyvals.hpp
   src/smpi/include/smpi_op.hpp
+  src/smpi/include/smpi_replay.hpp
   src/smpi/include/smpi_request.hpp
   src/smpi/include/smpi_status.hpp
   src/smpi/include/smpi_topo.hpp
@@ -309,9 +309,14 @@ set(SURF_SRC
   src/kernel/lmm/maxmin.cpp
 
   src/kernel/resource/Action.cpp
-  src/kernel/resource/Model.cpp
+  src/kernel/resource/CpuImpl.cpp
+  src/kernel/resource/CpuImpl.hpp
   src/kernel/resource/DiskImpl.cpp
   src/kernel/resource/DiskImpl.hpp
+  src/kernel/resource/Model.cpp
+  src/kernel/resource/Resource.hpp
+  src/kernel/resource/VirtualMachineImpl.hpp
+  src/kernel/resource/VirtualMachineImpl.cpp
 
   src/kernel/resource/profile/DatedValue.cpp
   src/kernel/resource/profile/DatedValue.hpp
@@ -345,7 +350,6 @@ set(SURF_SRC
   src/kernel/EngineImpl.hpp
 
   src/surf/cpu_cas01.cpp
-  src/surf/cpu_interface.cpp
   src/surf/cpu_ti.cpp
   src/surf/disk_s19.cpp
   src/surf/network_cm02.cpp
@@ -368,7 +372,6 @@ set(SURF_SRC
 
 set(PLUGINS_SRC
   src/plugins/ProducerConsumer.cpp
-  src/plugins/dirty_page_tracking.cpp
   src/plugins/host_dvfs.cpp
   src/plugins/host_energy.cpp
   src/plugins/link_energy.cpp
@@ -376,12 +379,7 @@ set(PLUGINS_SRC
   src/plugins/host_load.cpp
   src/plugins/link_load.cpp
   src/plugins/file_system/s4u_FileSystem.cpp
-  src/plugins/vm/VirtualMachineImpl.hpp
-  src/plugins/vm/s4u_VirtualMachine.cpp
-  src/plugins/vm/VirtualMachineImpl.hpp
-  src/plugins/vm/VirtualMachineImpl.cpp
-  src/plugins/vm/VmHostExt.hpp
-  src/plugins/vm/VmHostExt.cpp
+  src/plugins/vm/dirty_page_tracking.cpp
   src/plugins/vm/VmLiveMigration.cpp
   src/plugins/vm/VmLiveMigration.hpp
   )
@@ -399,7 +397,6 @@ set(SIMIX_SRC
   src/kernel/context/ContextSwapped.hpp
   src/kernel/context/ContextThread.cpp
   src/kernel/context/ContextThread.hpp
-  src/simix/smx_global.cpp
   src/simix/popping.cpp
   src/kernel/activity/ActivityImpl.cpp
   src/kernel/activity/ActivityImpl.hpp
@@ -458,6 +455,7 @@ set(S4U_SRC
   src/s4u/s4u_Mutex.cpp
   src/s4u/s4u_Netzone.cpp
   src/s4u/s4u_Semaphore.cpp
+  src/s4u/s4u_VirtualMachine.cpp
 )
 
 set(SIMGRID_SRC
@@ -639,7 +637,7 @@ set(MC_SRC
   src/mc/sosp/Region.hpp
   src/mc/sosp/Snapshot.hpp
   src/mc/sosp/Snapshot.cpp
-  
+
   src/mc/AddressSpace.hpp
   src/mc/ModelChecker.hpp
   src/mc/ModelChecker.cpp
@@ -685,7 +683,6 @@ set(headers_to_install
   include/simgrid/plugins/live_migration.h
   include/simgrid/plugins/load.h
   include/simgrid/plugins/ProducerConsumer.hpp
-  include/simgrid/smpi/smpi_replay.hpp
   include/simgrid/instr.h
   include/simgrid/mailbox.h
   include/simgrid/simdag.h
@@ -725,7 +722,6 @@ set(headers_to_install
   include/simgrid/kernel/resource/Action.hpp
   include/simgrid/kernel/resource/NetworkModelIntf.hpp
   include/simgrid/kernel/resource/Model.hpp
-  include/simgrid/kernel/resource/Resource.hpp
 
   include/simgrid/kernel/routing/ClusterZone.hpp
   include/simgrid/kernel/routing/DijkstraZone.hpp
@@ -968,7 +964,7 @@ set(DOC_SOURCES
   docs/source/tuto_smpi/roundtrip.c
 
   docs/source/tuto_disk/analysis.org
-  docs/source/tuto_disk/analysis.rst
+  docs/source/tuto_disk/analysis.irst
   docs/source/tuto_disk/CMakeLists.txt
   docs/source/tuto_disk/Dockerfile
   docs/source/tuto_disk/fig/edel_read_dhist.png
@@ -1127,8 +1123,8 @@ set(CMAKE_SOURCE_FILES
   tools/stack-cleaner/clean-stack-filter
   tools/stack-cleaner/compiler-wrapper
   tools/stack-cleaner/README
-  
-  setup.py 
+
+  setup.py
   MANIFEST.in
   MANIFEST.in.in
   )