Merge branch 'master' of github.com:simgrid/simgrid

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

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 8c6a2803709c22a7767b714ac5abc0c0b074fa99..25525840c2ea1d3963552e04133e5286623120a7 100644 (file)
--- 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
@@ -329,6 +329,8 @@ set(SURF_SRC
   src/kernel/resource/profile/FutureEvtSet.hpp
   src/kernel/resource/profile/Profile.cpp
   src/kernel/resource/profile/Profile.hpp
+  src/kernel/resource/profile/StochasticDatedValue.cpp
+  src/kernel/resource/profile/StochasticDatedValue.hpp
 
   src/kernel/routing/ClusterZone.cpp
   src/kernel/routing/DijkstraZone.cpp
@@ -342,6 +344,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
@@ -373,7 +376,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
@@ -606,7 +611,7 @@ set(MC_SRC
   src/mc/checker/SimcallInspector.hpp
   src/mc/checker/LivenessChecker.cpp
   src/mc/checker/LivenessChecker.hpp
-  
+
   src/mc/inspect/DwarfExpression.hpp
   src/mc/inspect/DwarfExpression.cpp
   src/mc/inspect/Frame.hpp
@@ -656,6 +661,8 @@ set(MC_SRC
   src/mc/mc_comm_pattern.cpp
   src/mc/mc_comm_pattern.hpp
   src/mc/compare.cpp
+  src/mc/mc_api.cpp
+  src/mc/mc_api.hpp
   src/mc/mc_hash.hpp
   src/mc/mc_hash.cpp
   src/mc/mc_ignore.hpp
@@ -745,6 +752,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
@@ -896,6 +904,20 @@ 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
 
@@ -1122,7 +1144,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
@@ -1195,6 +1217,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_energy.xml
   examples/platforms/wifi.xml
   )