X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/06a803f9b52e0197f3fcd17b3330a1bbcdfd0faf..bc603041d7ce7e32a2c888e7156e30035368b226:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 4d566376d9..957a554a89 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -24,7 +24,7 @@ set(EXTRA_DIST src/simix/popping_private.hpp src/simix/popping_bodies.cpp src/simix/popping_generated.cpp - src/simix/popping_enum.h + src/simix/popping_enum.hpp src/simix/popping_accessors.hpp src/simix/smx_private.hpp src/smpi/colls/coll_tuned_topo.hpp @@ -156,6 +156,7 @@ set(SMPI_SRC src/smpi/bindings/smpi_f77.cpp src/smpi/bindings/smpi_f77_coll.cpp src/smpi/bindings/smpi_f77_comm.cpp + src/smpi/bindings/smpi_f77_file.cpp src/smpi/bindings/smpi_f77_request.cpp src/smpi/bindings/smpi_f77_type.cpp src/smpi/colls/smpi_coll.cpp @@ -293,8 +294,8 @@ set(XBT_SRC src/xbt/xbt_log_layout_simple.cpp src/xbt/xbt_main.cpp src/xbt/xbt_os_file.cpp - src/xbt/xbt_os_synchro.cpp src/xbt/xbt_os_time.c + src/xbt/xbt_parse_units.cpp src/xbt/xbt_replay.cpp src/xbt/xbt_str.cpp src/xbt/xbt_virtu.cpp @@ -341,6 +342,7 @@ set(SURF_SRC src/kernel/routing/TorusZone.cpp src/kernel/routing/RoutedZone.cpp src/kernel/routing/VivaldiZone.cpp + src/kernel/routing/WifiZone.cpp src/kernel/EngineImpl.cpp src/kernel/EngineImpl.hpp @@ -372,7 +374,9 @@ set(PLUGINS_SRC src/plugins/host_dvfs.cpp src/plugins/host_energy.cpp src/plugins/link_energy.cpp + src/plugins/link_energy_wifi.cpp src/plugins/host_load.cpp + src/plugins/link_load.cpp src/plugins/file_system/s4u_FileSystem.cpp src/plugins/vm/VirtualMachineImpl.hpp src/plugins/vm/s4u_VirtualMachine.cpp @@ -566,7 +570,6 @@ set(TRACING_SRC 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_platform.cpp src/instr/instr_private.hpp @@ -626,12 +629,14 @@ set(MC_SRC src/mc/inspect/mc_unw.cpp src/mc/inspect/mc_unw_vmread.cpp + src/mc/remote/AppSide.cpp + src/mc/remote/AppSide.hpp src/mc/remote/Channel.cpp src/mc/remote/Channel.hpp - src/mc/remote/Client.cpp - src/mc/remote/Client.hpp - src/mc/remote/RemoteClient.hpp - src/mc/remote/RemoteClient.cpp + src/mc/remote/CheckerSide.cpp + src/mc/remote/CheckerSide.hpp + src/mc/remote/RemoteSimulation.hpp + src/mc/remote/RemoteSimulation.cpp src/mc/remote/RemotePtr.hpp src/mc/remote/mc_protocol.h src/mc/remote/mc_protocol.cpp @@ -658,7 +663,6 @@ set(MC_SRC src/mc/mc_hash.cpp src/mc/mc_ignore.hpp src/mc/mc_record.cpp - src/mc/mc_memory.cpp src/mc/mc_private.hpp src/mc/mc_request.hpp src/mc/mc_request.cpp @@ -679,7 +683,9 @@ set(MC_SIMGRID_MC_SRC src/mc/checker/simgrid_mc.cpp) set(headers_to_install include/simgrid/actor.h include/simgrid/barrier.h + include/simgrid/comm.h include/simgrid/engine.h + include/simgrid/exec.h include/simgrid/Exception.hpp include/simgrid/chrono.hpp include/simgrid/plugins/dvfs.h @@ -691,7 +697,6 @@ set(headers_to_install include/simgrid/smpi/replay.hpp include/simgrid/instr.h include/simgrid/mailbox.h - include/simgrid/msg.h include/simgrid/simdag.h include/simgrid/modelchecker.h include/simgrid/forward.h @@ -699,6 +704,7 @@ set(headers_to_install include/simgrid/simix.hpp include/simgrid/simix/blocking_simcall.hpp include/simgrid/kernel/future.hpp + include/simgrid/disk.h include/simgrid/host.h include/simgrid/link.h include/simgrid/cond.h @@ -742,6 +748,7 @@ set(headers_to_install include/simgrid/kernel/routing/RoutedZone.hpp include/simgrid/kernel/routing/TorusZone.hpp include/simgrid/kernel/routing/VivaldiZone.hpp + include/simgrid/kernel/routing/WifiZone.hpp include/smpi/mpi.h include/smpi/sampi.h @@ -776,6 +783,7 @@ set(headers_to_install include/xbt/module.h include/xbt/PropertyHolder.hpp include/xbt/parmap.h + include/xbt/parse_units.hpp include/xbt/range.hpp include/xbt/random.hpp include/xbt/replay.hpp @@ -795,7 +803,7 @@ set(source_of_generated_headers src/internal_config.h.in include/smpi/mpif.h.in) -### depend of some variables setted upper +### depend of some variables set upper if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext set(SIMIX_SRC ${SIMIX_SRC} src/kernel/context/ContextUnix.hpp src/kernel/context/ContextUnix.cpp) @@ -818,10 +826,12 @@ set(simgrid_sources ${SIMDAG_SRC} ) -if(${enable_MSG}) - set(simgrid_sources ${simgrid_sources} ${MSG_SRC}) +if(${enable_msg}) + set(headers_to_install ${headers_to_install} include/simgrid/msg.h) + set(simgrid_sources ${simgrid_sources} ${MSG_SRC}) else() - set(EXTRA_DIST ${EXTRA_DIST} ${MSG_SRC}) + set(EXTRA_DIST ${EXTRA_DIST} include/simgrid/msg.h + ${MSG_SRC}) endif() if(${SIMGRID_HAVE_JEDULE}) @@ -890,6 +900,21 @@ set(DOC_SOURCES docs/source/_ext/showfile.css docs/source/_ext/showfile.js docs/source/_ext/showfile.py + docs/source/_ext/javasphinx/LICENSE + docs/source/_ext/javasphinx/MANIFEST.in + docs/source/_ext/javasphinx/README.md + docs/source/_ext/javasphinx/doc/conf.py + docs/source/_ext/javasphinx/doc/index.rst + docs/source/_ext/javasphinx/javasphinx/__init__.py + docs/source/_ext/javasphinx/javasphinx/apidoc.py + docs/source/_ext/javasphinx/javasphinx/compiler.py + docs/source/_ext/javasphinx/javasphinx/domain.py + docs/source/_ext/javasphinx/javasphinx/extdoc.py + docs/source/_ext/javasphinx/javasphinx/formatter.py + docs/source/_ext/javasphinx/javasphinx/htmlrst.py + docs/source/_ext/javasphinx/javasphinx/util.py + docs/source/_ext/javasphinx/setup.py + docs/source/_static/css/custom.css docs/source/_templates/breadcrumbs.html docs/source/img/eclipseScreenShot.png @@ -1001,10 +1026,11 @@ set(txt_files # The list of cmake build directories is constructed from the following list. # Add your CMakeLists file here to see your subdir built. set(CMAKEFILES_TXT + examples/c/CMakeLists.txt examples/s4u/CMakeLists.txt examples/smpi/CMakeLists.txt examples/smpi/NAS/CMakeLists.txt - examples/smpi/smpi_s4u_masterslave/CMakeLists.txt + examples/smpi/smpi_s4u_masterworker/CMakeLists.txt examples/smpi/replay_multiple/CMakeLists.txt examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt examples/python/CMakeLists.txt @@ -1014,6 +1040,7 @@ set(CMAKEFILES_TXT examples/deprecated/simdag/CMakeLists.txt teshsuite/java/CMakeLists.txt + teshsuite/kernel/CMakeLists.txt teshsuite/lua/CMakeLists.txt teshsuite/mc/CMakeLists.txt teshsuite/msg/CMakeLists.txt @@ -1113,7 +1140,7 @@ set(CMAKE_SOURCE_FILES ) set(PLATFORMS_EXAMPLES - examples/platforms/bypassASroute.xml + examples/platforms/bypassZoneRoute.xml examples/platforms/bypassRoute.xml examples/platforms/cloud.xml examples/platforms/cluster_backbone.xml @@ -1133,6 +1160,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/optorsim/transform_optorsim_platform.pl examples/platforms/config.xml examples/platforms/config_tracing.xml + examples/platforms/model_checker_platform.xml examples/platforms/profiles/bourassa_state.profile examples/platforms/profiles/fafard_state.profile examples/platforms/profiles/faulty_host.profile @@ -1165,7 +1193,6 @@ set(PLATFORMS_EXAMPLES examples/platforms/simulacrum_7_hosts.xml examples/platforms/storage/content/small_content.txt examples/platforms/storage/content/storage_content.txt - examples/platforms/storage/remote_io.xml examples/platforms/storage/storage.xml examples/platforms/small_platform.xml examples/platforms/small_platform.lua @@ -1186,6 +1213,8 @@ set(PLATFORMS_EXAMPLES examples/platforms/two_hosts_platform_with_availability_included.xml examples/platforms/two_peers.xml examples/platforms/vivaldi.xml + examples/platforms/wifi_energy.xml + examples/platforms/wifi_ns3.xml examples/platforms/wifi.xml )