X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/877fd76c223fe2fba051129f3ba0339bb5566bce..561cb30f87c531af6b562249ddf90fac2a44aa92:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 7e9dc7c668..1e3d6be6b5 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -63,24 +63,10 @@ set(EXTRA_DIST
   src/surf/xml/simgrid_dtd.c
   src/surf/xml/surfxml_sax_cb.cpp
 
-  src/kernel/routing/AsImpl.hpp
-  src/kernel/routing/AsCluster.hpp
-  src/kernel/routing/AsClusterFatTree.hpp
-  src/kernel/routing/AsClusterTorus.hpp
-  src/kernel/routing/AsClusterDragonfly.hpp
-  src/kernel/routing/AsDijkstra.hpp
-  src/kernel/routing/AsFloyd.hpp
-  src/kernel/routing/AsFull.hpp
-  src/kernel/routing/AsRoutedGraph.hpp
-  src/kernel/routing/AsNone.hpp
-  src/kernel/routing/AsVivaldi.hpp  
-  src/kernel/routing/NetCard.hpp
-
   src/surf/storage_interface.hpp
   src/surf/storage_n11.hpp
   src/surf/surf_interface.hpp
   src/surf/surf_private.h
-  src/surf/surf_routing.hpp
   src/surf/PropertyHolder.hpp
   src/surf/host_clm03.hpp
   src/surf/HostImpl.hpp
@@ -295,18 +281,31 @@ set(NS3_SRC  src/surf/network_ns3.cpp
              src/surf/ns3/ns3_simulator.cc )
 
 set(SURF_SRC
-  src/kernel/routing/AsImpl.cpp
-  src/kernel/routing/AsCluster.cpp
-  src/kernel/routing/AsClusterFatTree.cpp
-  src/kernel/routing/AsClusterTorus.cpp
-  src/kernel/routing/AsClusterDragonfly.cpp
-  src/kernel/routing/AsDijkstra.cpp
-  src/kernel/routing/AsFloyd.cpp
-  src/kernel/routing/AsFull.cpp
-  src/kernel/routing/AsRoutedGraph.cpp
-  src/kernel/routing/AsNone.cpp
-  src/kernel/routing/AsVivaldi.cpp
-
+  src/kernel/routing/ClusterZone.cpp
+  src/kernel/routing/ClusterZone.hpp
+  src/kernel/routing/DijkstraZone.cpp
+  src/kernel/routing/DijkstraZone.hpp
+  src/kernel/routing/DragonflyZone.cpp
+  src/kernel/routing/DragonflyZone.hpp
+  src/kernel/routing/EmptyZone.cpp
+  src/kernel/routing/EmptyZone.hpp
+  src/kernel/routing/FatTreeZone.cpp
+  src/kernel/routing/FatTreeZone.hpp
+  src/kernel/routing/FloydZone.cpp
+  src/kernel/routing/FloydZone.hpp
+  src/kernel/routing/FullZone.cpp
+  src/kernel/routing/FullZone.hpp
+  src/kernel/routing/NetCard.cpp
+  src/kernel/routing/NetCard.hpp
+  src/kernel/routing/NetZoneImpl.cpp
+  src/kernel/routing/NetZoneImpl.hpp
+  src/kernel/routing/RoutedZone.cpp
+  src/kernel/routing/RoutedZone.hpp
+  src/kernel/routing/TorusZone.cpp
+  src/kernel/routing/TorusZone.hpp
+  src/kernel/routing/VivaldiZone.cpp
+  src/kernel/routing/VivaldiZone.hpp  
+  
   src/kernel/EngineImpl.cpp
   src/kernel/EngineImpl.hpp
 
@@ -364,7 +363,6 @@ set(SIMIX_SRC
   src/simix/smx_network.cpp
   src/simix/ActorImpl.cpp
   src/simix/smx_synchro.cpp
-  src/simix/smx_vm.cpp
   src/simix/popping.cpp
   src/kernel/activity/ActivityImpl.cpp
   src/kernel/activity/SynchroComm.cpp
@@ -391,15 +389,15 @@ endif()
 
 set(S4U_SRC
   src/s4u/s4u_actor.cpp
-  src/s4u/s4u_as.cpp
   src/s4u/s4u_activity.cpp
+  src/s4u/s4u_conditionVariable.cpp
   src/s4u/s4u_comm.cpp
   src/s4u/s4u_engine.cpp  
   src/s4u/s4u_file.cpp  
   src/s4u/s4u_host.cpp  
   src/s4u/s4u_mailbox.cpp
   src/s4u/s4u_mutex.cpp
-  src/s4u/s4u_conditionVariable.cpp
+  src/s4u/s4u_netzone.cpp
   src/s4u/s4u_storage.cpp
 )
 
@@ -653,14 +651,14 @@ set(headers_to_install
   include/simgrid/s4u/forward.hpp
   include/simgrid/s4u/Activity.hpp
   include/simgrid/s4u/Actor.hpp
-  include/simgrid/s4u/As.hpp
   include/simgrid/s4u/comm.hpp
+  include/simgrid/s4u/conditionVariable.hpp
   include/simgrid/s4u/engine.hpp  
   include/simgrid/s4u/file.hpp  
   include/simgrid/s4u/host.hpp  
   include/simgrid/s4u/Mailbox.hpp
   include/simgrid/s4u/Mutex.hpp
-  include/simgrid/s4u/conditionVariable.hpp
+  include/simgrid/s4u/NetZone.hpp
   include/simgrid/s4u/storage.hpp  
   include/simgrid/s4u/VirtualMachine.hpp  
   include/simgrid/s4u.hpp
@@ -997,6 +995,7 @@ set(CMAKEFILES_TXT
 
 set(CMAKE_SOURCE_FILES
   CMakeLists.txt
+  FindSimGrid.cmake
   tools/cmake/Tests.cmake
   tools/cmake/CTestConfig.cmake
   tools/cmake/CTestCustom.cmake
@@ -1016,7 +1015,6 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/Modules/FindNS3.cmake
   tools/cmake/Modules/FindPAPI.cmake
   tools/cmake/Modules/FindRngStream.cmake
-  tools/cmake/Modules/FindSimGrid.cmake
   tools/cmake/Modules/FindValgrind.cmake
   tools/cmake/Option.cmake
   tools/cmake/scripts/my_valgrind.pl