Merge branch 'condvar'

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

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index a22af8f..ec842ee 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -67,6 +67,7 @@ set(EXTRA_DIST
   src/surf/AsCluster.hpp
   src/surf/AsClusterFatTree.hpp
   src/surf/AsClusterTorus.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/AsDijkstra.hpp
   src/surf/AsFloyd.hpp
   src/surf/AsFull.hpp


@@ -292,6 +293,7 @@ set(SURF_SRC
   src/surf/AsCluster.cpp
   src/surf/AsClusterFatTree.cpp
   src/surf/AsClusterTorus.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/AsDijkstra.cpp
   src/surf/AsFloyd.cpp
   src/surf/AsFull.cpp


@@ -1048,6 +1050,9 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/cluster_and_one_host.xml
   examples/platforms/cluster_prototype.lua
   examples/platforms/cluster_no_backbone.xml
   examples/platforms/cluster_and_one_host.xml
   examples/platforms/cluster_prototype.lua
   examples/platforms/cluster_no_backbone.xml

+  examples/platforms/cluster_torus.xml
+  examples/platforms/cluster_fat_tree.xml
+  examples/platforms/cluster_dragonfly.xml

   examples/platforms/crosstraffic.xml
   examples/platforms/optorsim/gridpp_grid_2004.conf
   examples/platforms/optorsim/lcg_sept2004_grid.conf
   examples/platforms/crosstraffic.xml
   examples/platforms/optorsim/gridpp_grid_2004.conf
   examples/platforms/optorsim/lcg_sept2004_grid.conf


@@ -1071,7 +1076,6 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/dogbone.xml
   examples/platforms/energy_platform.xml
   examples/platforms/faulty_host.xml
   examples/platforms/dogbone.xml
   examples/platforms/energy_platform.xml
   examples/platforms/faulty_host.xml

-  examples/platforms/fat_tree_cluster.xml

   examples/platforms/g5k.xml
   examples/platforms/griffon.xml
   examples/platforms/meta_cluster.xml
   examples/platforms/g5k.xml
   examples/platforms/griffon.xml
   examples/platforms/meta_cluster.xml


@@ -1099,7 +1103,6 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/syscoord/median_meridian.syscoord
   examples/platforms/syscoord/median_p2psim.syscoord
   examples/platforms/three_multicore_hosts.xml
   examples/platforms/syscoord/median_meridian.syscoord
   examples/platforms/syscoord/median_p2psim.syscoord
   examples/platforms/three_multicore_hosts.xml

-  examples/platforms/torus_cluster.xml

   examples/platforms/two_clusters.xml
   examples/platforms/two_hosts.xml
   examples/platforms/two_hosts_platform_shared.xml
   examples/platforms/two_clusters.xml
   examples/platforms/two_hosts.xml
   examples/platforms/two_hosts_platform_shared.xml