X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/de88ba6429025fa6d048915b20148bc7a301f07f..1fc52b3b94e6c88b3321d6b44753c6ee7324d96a:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 7d624b6970..f97b443bdd 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -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 @@ -389,7 +390,6 @@ set(SIMIX_SRC src/kernel/future.cpp src/simix/libsmx.cpp src/simix/smx_context.cpp - src/kernel/context/context_private.hpp src/kernel/context/Context.cpp src/kernel/context/Context.hpp src/kernel/context/ContextRaw.cpp @@ -567,7 +567,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 @@ -627,12 +626,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 @@ -659,7 +660,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 @@ -680,7 +680,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 @@ -692,7 +694,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 @@ -700,6 +701,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 @@ -777,6 +779,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 @@ -796,7 +799,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) @@ -816,10 +819,17 @@ set(simgrid_sources ${XBT_SRC} ${PLUGINS_SRC} ${BINDINGS_SRC} - ${MSG_SRC} ${SIMDAG_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} include/simgrid/msg.h + ${MSG_SRC}) +endif() + if(${SIMGRID_HAVE_JEDULE}) set(simgrid_sources ${simgrid_sources} ${JEDULE_SRC}) else() @@ -880,11 +890,13 @@ set(DOC_SOURCES docs/requirements.txt docs/source/conf.py docs/source/Doxyfile + docs/find-missing.ignore docs/find-missing.py docs/source/_ext/autodoxy.py docs/source/_ext/showfile.css docs/source/_ext/showfile.js docs/source/_ext/showfile.py + docs/source/_static/css/custom.css docs/source/_templates/breadcrumbs.html docs/source/img/eclipseScreenShot.png @@ -912,8 +924,9 @@ set(DOC_SOURCES docs/source/ns3.rst docs/source/outcomes.rst docs/source/platform.rst - docs/source/platform_howtos.rst docs/source/Platform_Examples.rst + docs/source/platform_howtos.rst + docs/source/Platform_Routing.rst docs/source/Plugins.rst docs/source/XML_Reference.rst @@ -995,10 +1008,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_msg_masterslave/CMakeLists.txt + examples/smpi/smpi_s4u_masterslave/CMakeLists.txt examples/smpi/replay_multiple/CMakeLists.txt examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt examples/python/CMakeLists.txt @@ -1008,9 +1022,11 @@ 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 + teshsuite/python/CMakeLists.txt teshsuite/s4u/CMakeLists.txt teshsuite/simdag/CMakeLists.txt teshsuite/simix/CMakeLists.txt @@ -1089,6 +1105,7 @@ set(CMAKE_SOURCE_FILES tools/cmake/test_prog/prog_makecontext.c tools/cmake/test_prog/prog_stackgrowth.c tools/cmake/test_prog/prog_stacksetup.c + tools/cmake/test_prog/prog_tsan.cpp tools/cmake/cross-mingw.cmake tools/smpi/generate_smpi_defines.pl tools/stack-cleaner/as @@ -1125,6 +1142,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 @@ -1157,7 +1175,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 @@ -1178,6 +1195,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/two_hosts_platform_with_availability_included.xml examples/platforms/two_peers.xml examples/platforms/vivaldi.xml + examples/platforms/wifi_decay_2STA.xml examples/platforms/wifi.xml )