X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a15797ea55151ddfdbae48147e74159efe01b411..dc7dbc95710842c435b575d93f8255e0aee5dc5e:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 0b25bce4f0..1416671408 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -90,8 +90,8 @@ set(EXTRA_DIST src/xbt/automaton/parserPromela.tab.cacc src/xbt/automaton/parserPromela.tab.hacc src/xbt/automaton/parserPromela.yacc - src/xbt/backtrace_dummy.c - src/xbt/backtrace_linux.c + src/xbt/backtrace_dummy.cpp + src/xbt/backtrace_linux.cpp src/xbt/dict_private.h src/xbt/ex_interface.h src/xbt/fifo_private.h @@ -215,7 +215,7 @@ set(SMPI_SRC src/smpi/colls/reduce-rab.c src/smpi/colls/scatter-ompi.c src/smpi/colls/scatter-mvapich-two-level.c - src/smpi/colls/smpi_automatic_selector.c + src/smpi/colls/smpi_automatic_selector.cpp src/smpi/colls/smpi_mpich_selector.c src/smpi/colls/smpi_intel_mpi_selector.c src/smpi/colls/smpi_openmpi_selector.c @@ -224,7 +224,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 @@ -244,13 +244,15 @@ set(XBT_SRC src/xbt/RngStream.c src/xbt/automaton/automaton.c src/xbt/automaton/automatonparse_promela.c + src/xbt/backtrace.cpp src/xbt/config.cpp - src/xbt/cunit.c - src/xbt/dict.c + src/xbt/cunit.cpp + src/xbt/dict.cpp src/xbt/dict_cursor.c src/xbt/dict_elm.c - src/xbt/dynar.c - src/xbt/ex.c + src/xbt/dynar.cpp + src/xbt/ex.cpp + src/xbt/exception.cpp src/xbt/fifo.c src/xbt/graph.c src/xbt/heap.c @@ -271,8 +273,8 @@ set(XBT_SRC src/xbt/xbt_os_file.c src/xbt/xbt_os_synchro.c src/xbt/xbt_os_time.c - src/xbt/xbt_replay.c - src/xbt/xbt_str.c + src/xbt/xbt_replay.cpp + src/xbt/xbt_str.cpp src/xbt/xbt_strbuff.c src/xbt/xbt_virtu.c src/xbt_modinter.h @@ -379,6 +381,7 @@ 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_storage.cpp ) @@ -642,6 +645,7 @@ set(headers_to_install include/simgrid/s4u/file.hpp include/simgrid/s4u/host.hpp include/simgrid/s4u/mailbox.hpp + include/simgrid/s4u/mutex.hpp include/simgrid/s4u/storage.hpp include/simgrid/s4u.h include/simgrid/plugins/energy.h @@ -666,6 +670,9 @@ set(headers_to_install include/xbt/dynar.h include/xbt/dynar.hpp include/xbt/ex.h + include/xbt/exception.hpp + include/xbt/backtrace.h + include/xbt/backtrace.hpp include/xbt/fifo.h include/xbt/file.h include/xbt/function_types.h @@ -676,6 +683,7 @@ set(headers_to_install include/xbt/lib.h include/xbt/Extendable.hpp include/xbt/log.h + include/xbt/log.hpp include/xbt/mallocator.h include/xbt/matrix.h include/xbt/memory.hpp @@ -691,6 +699,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 @@ -789,7 +798,6 @@ set(DOC_SOURCES doc/doxygen/FAQ.doc doc/doxygen/application.doc - doc/doxygen/bindings.doc doc/doxygen/community.doc doc/doxygen/community_contact.doc doc/doxygen/community_extend.doc @@ -807,9 +815,12 @@ set(DOC_SOURCES doc/doxygen/inside_extending.doc doc/doxygen/inside_release.doc doc/doxygen/install.doc + doc/doxygen/install_yours.doc + doc/doxygen/java.doc 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 @@ -1026,7 +1037,6 @@ set(CMAKE_SOURCE_FILES ) set(PLATFORMS_EXAMPLES - examples/platforms/2clusters.xml examples/platforms/bypassASroute.xml examples/platforms/bypassRoute.xml examples/platforms/cloud.xml @@ -1034,7 +1044,6 @@ set(PLATFORMS_EXAMPLES examples/platforms/cluster_and_one_host.xml examples/platforms/cluster_prototype.lua examples/platforms/cluster_no_backbone.xml - examples/platforms/clusters_routing_full.xml examples/platforms/crosstraffic.xml examples/platforms/optorsim/gridpp_grid_2004.conf examples/platforms/optorsim/lcg_sept2004_grid.conf @@ -1087,8 +1096,8 @@ set(PLATFORMS_EXAMPLES 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.xml examples/platforms/two_hosts_platform_shared.xml examples/platforms/two_hosts_platform_with_availability.xml examples/platforms/two_hosts_platform_with_availability_included.xml