Merge branch 'depencencies' into 'master'

[simgrid.git] / tools / cmake / DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index a709fd7..4d56637 100644 (file)
--- 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
@@ -284,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
@@ -353,7 +353,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
@@ -390,7 +389,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
@@ -463,6 +461,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
   )
 
@@ -775,6 +774,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
@@ -791,8 +791,8 @@ 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
@@ -815,10 +815,15 @@ set(simgrid_sources
   ${XBT_SRC}
   ${PLUGINS_SRC}
   ${BINDINGS_SRC}
-  ${MSG_SRC}
   ${SIMDAG_SRC}
   )
 
+if(${enable_MSG})
+  set(simgrid_sources ${simgrid_sources}   ${MSG_SRC})
+else()
+  set(EXTRA_DIST      ${EXTRA_DIST}        ${MSG_SRC})
+endif()
+
 if(${SIMGRID_HAVE_JEDULE})
   set(simgrid_sources  ${simgrid_sources}  ${JEDULE_SRC})
 else()
@@ -879,6 +884,7 @@ 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
@@ -911,8 +917,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
 
@@ -997,7 +1004,7 @@ set(CMAKEFILES_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
@@ -1010,6 +1017,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
@@ -1044,6 +1052,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
@@ -1087,6 +1096,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