Move the ns3 helper files to kernel/models/ns3

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

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 4c43174..0fbc70e 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -15,6 +15,7 @@ set(EXTRA_DIST
   src/include/xbt/xbt_modinter.h
   src/include/xxhash.hpp
   src/kernel/actor/Simcall.hpp
+  src/kernel/resource/HostImpl.hpp
   src/kernel/resource/LinkImpl.hpp
   src/kernel/resource/NetworkModel.hpp
   src/kernel/resource/NetworkModelFactors.hpp
@@ -29,7 +30,7 @@ set(EXTRA_DIST
   src/kernel/resource/models/network_constant.hpp
   src/kernel/resource/models/network_ib.hpp
   src/kernel/resource/models/network_ns3.hpp
-  src/surf/ns3/ns3_simulator.hpp
+  src/kernel/resource/models/ns3/ns3_simulator.hpp
   src/kernel/resource/models/ptask_L07.hpp
   
   src/mc/mc_mmu.hpp
@@ -41,7 +42,6 @@ set(EXTRA_DIST
   src/smpi/include/smpi_utils.hpp
   src/smpi/smpi_main.c
   src/smpi/smpi_replay_main.cpp
-  src/surf/HostImpl.hpp
   src/surf/surf_interface.hpp
   src/surf/xml/simgrid.dtd
   src/surf/xml/simgrid_dtd.c
@@ -294,7 +294,7 @@ endif()
 
 set(NS3_SRC
   src/kernel/resource/models/network_ns3.cpp
-  src/surf/ns3/ns3_simulator.cpp
+  src/kernel/resource/models/ns3/ns3_simulator.cpp
   )
 
 set(SURF_SRC
@@ -315,6 +315,7 @@ set(SURF_SRC
   src/kernel/resource/DiskImpl.hpp
   src/kernel/resource/FactorSet.cpp
   src/kernel/resource/FactorSet.hpp
+  src/kernel/resource/HostImpl.cpp
   src/kernel/resource/Model.cpp
   src/kernel/resource/NetworkModel.cpp
   src/kernel/resource/NetworkModelFactors.cpp
@@ -359,7 +360,6 @@ set(SURF_SRC
 
   src/kernel/timer/Timer.cpp
 
-  src/surf/HostImpl.cpp
   src/surf/sg_platf.cpp
   src/surf/xml/platf.hpp
   src/surf/xml/platf_private.hpp
@@ -985,7 +985,6 @@ set(CMAKEFILES_TXT
   teshsuite/smpi/mpich3-test/rma/CMakeLists.txt
   teshsuite/smpi/mpich3-test/topo/CMakeLists.txt
 
-  teshsuite/surf/CMakeLists.txt
   teshsuite/xbt/CMakeLists.txt
   tools/CMakeLists.txt
   tools/graphicator/CMakeLists.txt