X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/794555c12839e503e3fd6e101e3e82336036939e..90741b7a1ae335b53a4d782db8223a5ba9016e1f:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 794398ba8e..5151ea1def 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -6,10 +6,9 @@ set(EXTRA_DIST src/include/mc/datatypes.h src/include/mc/mc.h src/include/simgrid/sg_config.h - src/include/smpi/smpi_utils.hpp - src/include/surf/datatypes.h + src/include/surf/datatypes.hpp src/include/surf/maxmin.hpp - src/include/surf/surf.h + src/include/surf/surf.hpp src/include/xbt/parmap.hpp src/mc/mc_mmu.hpp src/mc/mc_record.hpp @@ -35,10 +34,10 @@ set(EXTRA_DIST src/smpi/colls/colls_private.hpp src/smpi/colls/smpi_mvapich2_selector_stampede.hpp src/smpi/include/private.hpp + src/smpi/include/smpi_utils.hpp src/surf/cpu_cas01.hpp src/surf/cpu_interface.hpp src/surf/cpu_ti.hpp - src/surf/maxmin_private.hpp src/surf/network_cm02.hpp src/surf/network_constant.hpp src/surf/network_interface.hpp @@ -53,7 +52,6 @@ set(EXTRA_DIST src/surf/xml/simgrid_dtd.c src/surf/xml/surfxml_sax_cb.cpp - src/surf/FileImpl.hpp src/surf/StorageImpl.hpp src/surf/storage_n11.hpp src/surf/surf_interface.hpp @@ -71,7 +69,6 @@ set(EXTRA_DIST src/xbt/backtrace_linux.cpp src/xbt/dict_private.h src/xbt/graph_private.h - src/xbt/heap_private.h src/xbt/log_private.h src/xbt/mallocator_private.h @@ -275,7 +272,6 @@ set(XBT_SRC src/xbt/ex.cpp src/xbt/exception.cpp src/xbt/graph.c - src/xbt/heap.c src/xbt/log.c src/xbt/mallocator.c src/xbt/memory_map.cpp @@ -288,7 +284,7 @@ set(XBT_SRC src/xbt/xbt_log_layout_format.c src/xbt/xbt_log_layout_simple.c src/xbt/xbt_main.cpp - src/xbt/xbt_os_file.c + src/xbt/xbt_os_file.cpp src/xbt/xbt_os_synchro.cpp src/xbt/xbt_os_time.c src/xbt/xbt_replay.cpp @@ -337,7 +333,6 @@ set(SURF_SRC src/surf/cpu_interface.cpp src/surf/cpu_ti.cpp src/surf/fair_bottleneck.cpp - src/surf/FileImpl.cpp src/surf/instr_routing.cpp src/surf/instr_surf.cpp src/surf/lagrange.cpp @@ -346,6 +341,7 @@ set(SURF_SRC src/surf/network_constant.cpp src/surf/network_interface.cpp src/surf/plugins/host_energy.cpp + src/surf/plugins/link_energy.cpp src/surf/plugins/host_load.cpp src/surf/PropertyHolder.cpp src/surf/sg_platf.cpp @@ -380,6 +376,7 @@ set(SIMIX_SRC src/kernel/context/Context.cpp src/kernel/context/Context.hpp src/kernel/context/ContextRaw.cpp + src/kernel/context/ContextRaw.hpp src/simix/smx_deployment.cpp src/simix/smx_environment.cpp src/simix/smx_global.cpp @@ -548,10 +545,15 @@ set(TRACING_SRC src/instr/instr_config.cpp src/instr/instr_interface.cpp src/instr/instr_paje_containers.cpp + src/instr/instr_paje_containers.hpp + src/instr/instr_paje_events.cpp + src/instr/instr_paje_events.hpp src/instr/instr_paje_header.cpp src/instr/instr_paje_trace.cpp src/instr/instr_paje_types.cpp + src/instr/instr_paje_types.hpp src/instr/instr_paje_values.cpp + src/instr/instr_paje_values.hpp src/instr/instr_private.hpp src/instr/instr_smpi.hpp src/instr/instr_resource_utilization.cpp @@ -572,7 +574,7 @@ set(MC_SRC_BASE src/mc/mc_base.cpp src/mc/mc_base.h src/mc/mc_record.hpp - src/mc/mc_replay.h + src/mc/mc_replay.hpp src/mc/mc_record.cpp src/mc/mc_config.cpp src/mc/mc_global.cpp @@ -661,6 +663,7 @@ set(MC_SIMGRID_MC_SRC src/mc/checker/simgrid_mc.cpp) set(headers_to_install include/simgrid/chrono.hpp include/simgrid/plugins/energy.h + include/simgrid/plugins/file_system.h include/simgrid/plugins/load.h include/simgrid/instr.h include/simgrid/msg.h @@ -715,12 +718,11 @@ set(headers_to_install include/xbt/ex.hpp include/xbt/exception.hpp include/xbt/Extendable.hpp - include/xbt/file.h + include/xbt/file.hpp include/xbt/functional.hpp include/xbt/function_types.h include/xbt/future.hpp include/xbt/graph.h - include/xbt/heap.h include/xbt/log.h include/xbt/log.hpp include/xbt/mallocator.h @@ -765,9 +767,11 @@ else() # NOT pthread endif() if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext - set(SURF_SRC ${SURF_SRC} src/kernel/context/ContextUnix.cpp) + set(SURF_SRC ${SURF_SRC} src/kernel/context/ContextUnix.hpp + src/kernel/context/ContextUnix.cpp) else() # NOT ucontext - set(EXTRA_DIST ${EXTRA_DIST} src/kernel/context/ContextUnix.cpp) + set(EXTRA_DIST ${EXTRA_DIST} src/kernel/context/ContextUnix.hpp + src/kernel/context/ContextUnix.cpp) endif() ### Simgrid Lib sources @@ -918,6 +922,7 @@ set(DOC_TOOLS set(DOC_IMG ${CMAKE_HOME_DIRECTORY}/doc/sc3-description.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/AS_hierarchy.png + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/eclipseScreenShot.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot_thn.jpg ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.gif