X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a5c5765ba9e8336b55101d248a8f43fbf9cd0c0c..f540320e2e4fd4fe5c9cb1bf8a4b1c0a972082e6:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index eb8ef777c7..5b9e5938cf 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -31,12 +31,12 @@ set(EXTRA_DIST src/simix/smx_private.h src/simix/smx_process_private.h src/simix/smx_synchro_private.h - src/simix/Synchro.h - src/simix/SynchroComm.hpp - src/simix/SynchroExec.hpp - src/simix/SynchroIo.hpp - src/simix/SynchroSleep.hpp - src/simix/SynchroRaw.hpp + src/synchro/Synchro.h + src/synchro/SynchroComm.hpp + src/synchro/SynchroExec.hpp + src/synchro/SynchroIo.hpp + src/synchro/SynchroSleep.hpp + src/synchro/SynchroRaw.hpp src/smpi/README src/smpi/colls/coll_tuned_topo.h src/smpi/colls/colls.h @@ -63,16 +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/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 @@ -224,7 +225,7 @@ set(SMPI_SRC src/smpi/smpi_base.cpp src/smpi/smpi_bench.cpp src/smpi/smpi_memory.cpp - src/smpi/smpi_c99.cpp + src/smpi/smpi_static_variables.cpp src/smpi/smpi_coll.cpp src/smpi/smpi_comm.cpp src/smpi/smpi_deployment.cpp @@ -288,16 +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/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 @@ -335,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 @@ -349,12 +352,12 @@ set(SIMIX_SRC src/simix/smx_synchro.cpp src/simix/smx_vm.cpp src/simix/popping.cpp - src/simix/Synchro.cpp - src/simix/SynchroComm.cpp - src/simix/SynchroExec.cpp - src/simix/SynchroSleep.cpp - src/simix/SynchroRaw.cpp - src/simix/SynchroIo.cpp + src/synchro/Synchro.cpp + src/synchro/SynchroComm.cpp + src/synchro/SynchroExec.cpp + src/synchro/SynchroSleep.cpp + src/synchro/SynchroRaw.cpp + src/synchro/SynchroIo.cpp ${SIMIX_GENERATED_SRC} ) @@ -381,6 +384,8 @@ set(S4U_SRC 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_storage.cpp ) @@ -622,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 @@ -633,19 +638,23 @@ set(headers_to_install include/simgrid/forward.h include/simgrid/simix.h include/simgrid/simix.hpp + include/simgrid/simix/blocking_simcall.hpp + include/simgrid/kernel/future.hpp include/simgrid/host.h include/simgrid/link.h include/simgrid/s4u/forward.hpp - include/simgrid/s4u/actor.hpp - include/simgrid/s4u/As.hpp include/simgrid/s4u/Activity.hpp + include/simgrid/s4u/Actor.hpp + include/simgrid/s4u/As.hpp include/simgrid/s4u/comm.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/storage.hpp - include/simgrid/s4u.h + include/simgrid/s4u.hpp include/simgrid/plugins/energy.h include/smpi/mpi.h include/smpi/smpi.h @@ -668,6 +677,7 @@ set(headers_to_install include/xbt/dynar.h include/xbt/dynar.hpp include/xbt/ex.h + include/xbt/ex.hpp include/xbt/exception.hpp include/xbt/backtrace.h include/xbt/backtrace.hpp @@ -697,6 +707,7 @@ set(headers_to_install include/xbt/synchro_core.h include/xbt/sysdep.h include/xbt/system_error.hpp + include/xbt/utility.hpp include/xbt/virtu.h include/xbt/xbt_os_thread.h include/xbt/xbt_os_time.h @@ -817,6 +828,7 @@ set(DOC_SOURCES doc/doxygen/tutorial.doc doc/doxygen/models.doc doc/doxygen/module-msg.doc + doc/doxygen/module-s4u.doc doc/doxygen/module-sd.doc doc/doxygen/module-simix.doc doc/doxygen/module-smpi.doc @@ -1040,6 +1052,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_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 @@ -1063,13 +1078,11 @@ set(PLATFORMS_EXAMPLES 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/multicore_machine.xml examples/platforms/onelink.xml - examples/platforms/platform.xml examples/platforms/prop.xml examples/platforms/routing_cluster.xml examples/platforms/routing_cluster.lua @@ -1091,7 +1104,6 @@ set(PLATFORMS_EXAMPLES 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