X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf6a962eb4e88efbed3df9c41343adabcf09e6c..1fc52b3b94e6c88b3321d6b44753c6ee7324d96a:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 642e972c8f..f97b443bdd 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -43,6 +43,7 @@ set(EXTRA_DIST
   src/surf/network_ns3.hpp
   src/surf/network_smpi.hpp
   src/surf/network_ib.hpp
+  src/surf/network_wifi.hpp
   src/surf/ns3/ns3_simulator.hpp
   src/surf/xml/simgrid.dtd
   src/surf/xml/simgrid_dtd.h
@@ -54,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
@@ -99,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
@@ -116,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
@@ -154,8 +156,17 @@ 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
+  src/smpi/colls/smpi_nbc_impl.cpp
+  src/smpi/colls/smpi_automatic_selector.cpp
+  src/smpi/colls/smpi_default_selector.cpp
+  src/smpi/colls/smpi_mpich_selector.cpp
+  src/smpi/colls/smpi_intel_mpi_selector.cpp
+  src/smpi/colls/smpi_openmpi_selector.cpp
+  src/smpi/colls/smpi_mvapich2_selector.cpp
   src/smpi/colls/allgather/allgather-2dmesh.cpp
   src/smpi/colls/allgather/allgather-3dmesh.cpp
   src/smpi/colls/allgather/allgather-GB.cpp
@@ -255,18 +266,9 @@ set(SMPI_SRC
   src/smpi/colls/reduce/reduce-rab.cpp
   src/smpi/colls/scatter/scatter-ompi.cpp
   src/smpi/colls/scatter/scatter-mvapich-two-level.cpp
-  src/smpi/colls/smpi_nbc_impl.cpp
-  src/smpi/colls/smpi_automatic_selector.cpp
-  src/smpi/colls/smpi_default_selector.cpp
-  src/smpi/colls/smpi_mpich_selector.cpp
-  src/smpi/colls/smpi_intel_mpi_selector.cpp
-  src/smpi/colls/smpi_openmpi_selector.cpp
-  src/smpi/colls/smpi_mvapich2_selector.cpp
-  src/smpi/colls/smpi_coll.cpp
   )
 
 set(XBT_SRC
-  src/xbt/RngStream.c
   src/xbt/automaton/automaton.c
   src/xbt/automaton/automatonparse_promela.c
   src/xbt/backtrace.cpp
@@ -282,7 +284,9 @@ 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
   src/xbt/string.cpp
   src/xbt/xbt_log_appender_file.cpp
@@ -290,11 +294,11 @@ 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.c
+  src/xbt/xbt_virtu.cpp
   src/xbt_modinter.h
   )
 
@@ -349,7 +353,7 @@ set(SURF_SRC
   src/surf/network_cm02.cpp
   src/surf/network_constant.cpp
   src/surf/network_interface.cpp
-  src/surf/PropertyHolder.cpp
+  src/surf/network_wifi.cpp
   src/surf/sg_platf.cpp
   src/surf/StorageImpl.cpp
   src/surf/storage_n11.cpp
@@ -386,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
@@ -459,6 +462,7 @@ set(S4U_SRC
 set(SIMGRID_SRC
   src/simgrid/Exception.cpp
   src/simgrid/sg_config.cpp
+  src/simgrid/sg_version.cpp
   src/simgrid/util.hpp
   )
 
@@ -496,8 +500,6 @@ set(JMSG_C_SRC
   src/bindings/java/jmsg_host.h
   src/bindings/java/jmsg_process.cpp
   src/bindings/java/jmsg_process.h
-  src/bindings/java/jmsg_rngstream.cpp
-  src/bindings/java/jmsg_rngstream.h
   src/bindings/java/jmsg_synchro.cpp
   src/bindings/java/jmsg_synchro.h
   src/bindings/java/jmsg_task.cpp
@@ -527,7 +529,6 @@ set(JMSG_JAVA_SRC
   src/bindings/java/org/simgrid/msg/Process.java
   src/bindings/java/org/simgrid/msg/ProcessKilledError.java
   src/bindings/java/org/simgrid/msg/ProcessNotFoundException.java
-  src/bindings/java/org/simgrid/msg/RngStream.java
   src/bindings/java/org/simgrid/msg/Semaphore.java
   src/bindings/java/org/simgrid/msg/Storage.java
   src/bindings/java/org/simgrid/msg/StorageNotFoundException.java
@@ -566,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
@@ -626,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
@@ -658,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
@@ -677,10 +678,11 @@ set(MC_SRC
 set(MC_SIMGRID_MC_SRC  src/mc/checker/simgrid_mc.cpp)
 
 set(headers_to_install
-  include/simgrid_config.h
   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
@@ -775,10 +777,12 @@ 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/parse_units.hpp
   include/xbt/range.hpp
+  include/xbt/random.hpp
   include/xbt/replay.hpp
-  include/xbt/RngStream.h
   include/xbt/signal.hpp
   include/xbt/str.h
   include/xbt/string.hpp
@@ -791,11 +795,11 @@ set(headers_to_install
   )
 set(source_of_generated_headers
   include/simgrid/config.h.in
+  include/simgrid/version.h.in
   src/internal_config.h.in
-  src/simgrid/version.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)
@@ -815,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()
@@ -866,6 +877,8 @@ set(DOC_SOURCES
   doc/doxygen/uhood_switch.doc
   doc/doxygen/uhood_arch.doc
 
+  examples/README.rst
+
   docs/manpages/smpicc.1
   docs/manpages/smpicxx.1
   docs/manpages/smpif90.1
@@ -877,15 +890,19 @@ set(DOC_SOURCES
   docs/requirements.txt
   docs/source/conf.py
   docs/source/Doxyfile
-  docs/source/_ext/hidden_code_block.py
+  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
   docs/source/img/extlink.png
   docs/source/img/extlink.svg
   docs/source/img/graphical-toc.svg
-  docs/source/img/lang_cpp.png
-  docs/source/img/lang_python.png
   docs/source/img/smpi_simgrid_alltoall_pair_16.png
   docs/source/img/smpi_simgrid_alltoall_ring_16.png
   docs/source/img/zone_hierarchy.png
@@ -907,8 +924,10 @@ 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
 
   docs/source/Tutorial_Algorithms.rst
@@ -989,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
@@ -1002,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
@@ -1039,6 +1061,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
@@ -1082,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
@@ -1118,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
@@ -1150,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
@@ -1171,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
   )