Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 1e6ac4f..5d27441 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -63,17 +63,17 @@ set(EXTRA_DIST
   src/surf/xml/simgrid_dtd.c
   src/surf/xml/surfxml_sax_cb.cpp
 
-  src/surf/AsImpl.hpp
-  src/surf/AsCluster.hpp
-  src/surf/AsClusterFatTree.hpp
-  src/surf/AsClusterTorus.hpp
-  src/surf/AsClusterDragonfly.hpp
-  src/surf/AsDijkstra.hpp
-  src/surf/AsFloyd.hpp
-  src/surf/AsFull.hpp
-  src/surf/AsRoutedGraph.hpp
-  src/surf/AsNone.hpp
-  src/surf/AsVivaldi.hpp
+  src/routing/AsImpl.hpp
+  src/routing/AsCluster.hpp
+  src/routing/AsClusterFatTree.hpp
+  src/routing/AsClusterTorus.hpp
+  src/routing/AsClusterDragonfly.hpp
+  src/routing/AsDijkstra.hpp
+  src/routing/AsFloyd.hpp
+  src/routing/AsFull.hpp
+  src/routing/AsRoutedGraph.hpp
+  src/routing/AsNone.hpp
+  src/routing/AsVivaldi.hpp
 
   src/surf/storage_interface.hpp
   src/surf/storage_n11.hpp
@@ -289,17 +289,17 @@ set(NS3_SRC  src/surf/network_ns3.cpp
              src/surf/ns3/ns3_simulator.cc )
 
 set(SURF_SRC
-  src/surf/AsImpl.cpp
-  src/surf/AsCluster.cpp
-  src/surf/AsClusterFatTree.cpp
-  src/surf/AsClusterTorus.cpp
-  src/surf/AsClusterDragonfly.cpp
-  src/surf/AsDijkstra.cpp
-  src/surf/AsFloyd.cpp
-  src/surf/AsFull.cpp
-  src/surf/AsRoutedGraph.cpp
-  src/surf/AsNone.cpp
-  src/surf/AsVivaldi.cpp
+  src/routing/AsImpl.cpp
+  src/routing/AsCluster.cpp
+  src/routing/AsClusterFatTree.cpp
+  src/routing/AsClusterTorus.cpp
+  src/routing/AsClusterDragonfly.cpp
+  src/routing/AsDijkstra.cpp
+  src/routing/AsFloyd.cpp
+  src/routing/AsFull.cpp
+  src/routing/AsRoutedGraph.cpp
+  src/routing/AsNone.cpp
+  src/routing/AsVivaldi.cpp
   
   src/surf/cpu_cas01.cpp
   src/surf/cpu_interface.cpp
@@ -337,6 +337,7 @@ set(SURF_SRC
 
 set(SIMIX_GENERATED_SRC   src/simix/popping_generated.cpp  )
 set(SIMIX_SRC
+  src/kernel/future.cpp
   src/simix/libsmx.cpp
   src/simix/smx_context.cpp
   src/simix/Context.cpp
@@ -626,7 +627,7 @@ set(headers_to_install
   include/msg/datatypes.h
   include/simdag/simdag.h
   include/simdag/datatypes.h
-  
+  include/simgrid/chrono.hpp
   include/simgrid/plugins/energy.h
   include/simgrid/instr.h
   include/simgrid/msg.h