X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/477fc68ab3dd1b5210d7db49144d90d0d9e57993..bc603041d7ce7e32a2c888e7156e30035368b226:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 8faa9a6cf7..957a554a89 100644
--- 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
@@ -342,6 +342,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 +374,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
@@ -745,6 +748,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
@@ -799,7 +803,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)
@@ -896,6 +900,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
 
@@ -1012,7 +1030,7 @@ set(CMAKEFILES_TXT
   examples/s4u/CMakeLists.txt
   examples/smpi/CMakeLists.txt
   examples/smpi/NAS/CMakeLists.txt
-  examples/smpi/smpi_s4u_masterslave/CMakeLists.txt
+  examples/smpi/smpi_s4u_masterworker/CMakeLists.txt
   examples/smpi/replay_multiple/CMakeLists.txt
   examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
   examples/python/CMakeLists.txt
@@ -1122,7 +1140,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,7 +1213,8 @@ 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_energy.xml
+  examples/platforms/wifi_ns3.xml
   examples/platforms/wifi.xml
   )