X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/78cfd86352a4b7097c255e40e8eb98619d515926..448ce0224df27e7f85a55f3c3297dd952db25cda:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 0d278d9606..b2118916b3 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -55,7 +55,6 @@ set(EXTRA_DIST src/surf/storage_n11.hpp src/surf/surf_interface.hpp src/surf/surf_private.hpp - src/surf/PropertyHolder.hpp src/surf/host_clm03.hpp src/surf/HostImpl.hpp src/surf/ptask_L07.hpp @@ -100,6 +99,7 @@ set(SMPI_SRC src/smpi/internals/smpi_replay.cpp src/smpi/internals/smpi_actor.cpp src/smpi/internals/smpi_utils.cpp + src/smpi/internals/smpi_config.cpp src/smpi/mpi/smpi_comm.cpp src/smpi/mpi/smpi_datatype.cpp src/smpi/mpi/smpi_datatype_derived.cpp @@ -117,6 +117,7 @@ set(SMPI_SRC src/smpi/include/smpi_actor.hpp src/smpi/include/smpi_coll.hpp src/smpi/include/smpi_comm.hpp + src/smpi/include/smpi_config.hpp src/smpi/include/smpi_datatype_derived.hpp src/smpi/include/smpi_datatype.hpp src/smpi/include/smpi_errhandler.hpp @@ -282,6 +283,7 @@ set(XBT_SRC src/xbt/memory_map.cpp src/xbt/memory_map.hpp src/xbt/OsSemaphore.hpp + src/xbt/PropertyHolder.cpp src/xbt/parmap.cpp src/xbt/random.cpp src/xbt/snprintf.c @@ -291,7 +293,6 @@ 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_replay.cpp src/xbt/xbt_str.cpp @@ -351,7 +352,6 @@ set(SURF_SRC src/surf/network_constant.cpp src/surf/network_interface.cpp src/surf/network_wifi.cpp - src/surf/PropertyHolder.cpp src/surf/sg_platf.cpp src/surf/StorageImpl.cpp src/surf/storage_n11.cpp @@ -388,7 +388,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 @@ -679,7 +678,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 +692,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 +699,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 @@ -774,6 +775,7 @@ set(headers_to_install include/xbt/mallocator.h include/xbt/misc.h include/xbt/module.h + include/xbt/PropertyHolder.hpp include/xbt/parmap.h include/xbt/range.hpp include/xbt/random.hpp @@ -814,10 +816,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() @@ -878,11 +887,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 @@ -910,8 +921,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 @@ -993,10 +1005,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 @@ -1009,6 +1022,7 @@ set(CMAKEFILES_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 @@ -1043,6 +1057,7 @@ set(CMAKEFILES_TXT teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt teshsuite/smpi/mpich3-test/group/CMakeLists.txt teshsuite/smpi/mpich3-test/info/CMakeLists.txt + teshsuite/smpi/mpich3-test/io/CMakeLists.txt teshsuite/smpi/mpich3-test/init/CMakeLists.txt teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt teshsuite/smpi/mpich3-test/topo/CMakeLists.txt @@ -1086,6 +1101,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 @@ -1154,7 +1170,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