Merge branch 'master' into S4U

[simgrid.git] / buildtools / Cmake / DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 451dfe8..1dc9ef3 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -378,6 +378,13 @@ else()
       src/simix/smx_context_boost.cpp)
 endif()
 
       src/simix/smx_context_boost.cpp)
 endif()
 

+set(S4U_SRC
+  src/s4u/s4u_channel.cpp
+  src/s4u/s4u_engine.cpp  
+  src/s4u/s4u_host.cpp  
+  src/s4u/s4u_process.cpp
+)
+

 set(SIMGRID_SRC
   src/simgrid/sg_config.c
   src/simgrid/host.cpp
 set(SIMGRID_SRC
   src/simgrid/sg_config.c
   src/simgrid/host.cpp


@@ -683,6 +690,11 @@ set(headers_to_install
   include/simgrid/simix.h
   include/simgrid/host.h
   include/simgrid/link.h
   include/simgrid/simix.h
   include/simgrid/host.h
   include/simgrid/link.h

+  include/simgrid/s4u/channel.hpp  
+  include/simgrid/s4u/engine.hpp  
+  include/simgrid/s4u/host.hpp  
+  include/simgrid/s4u/process.hpp
+  include/simgrid/s4u.h

   include/smpi/mpi.h
   include/smpi/smpi.h
   include/smpi/smpi_cocci.h
   include/smpi/mpi.h
   include/smpi/smpi.h
   include/smpi/smpi_cocci.h


@@ -766,6 +778,7 @@ endif()
 ### Simgrid Lib sources
 set(simgrid_sources
   ${BINDINGS_SRC}
 ### Simgrid Lib sources
 set(simgrid_sources
   ${BINDINGS_SRC}

+  ${S4U_SRC}

   ${MSG_SRC}
   ${SIMDAG_SRC}
   ${SIMGRID_SRC}
   ${MSG_SRC}
   ${SIMDAG_SRC}
   ${SIMGRID_SRC}


@@ -1036,6 +1049,8 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/msg/suspend/CMakeLists.txt
   examples/msg/token_ring/CMakeLists.txt
   examples/msg/tracing/CMakeLists.txt
   examples/msg/suspend/CMakeLists.txt
   examples/msg/token_ring/CMakeLists.txt
   examples/msg/tracing/CMakeLists.txt

+  examples/s4u/CMakeLists.txt
+  examples/s4u/dumb/CMakeLists.txt

   examples/scala/CMakeLists.txt
   examples/scala/master_slave_bypass/CMakeLists.txt
   examples/scala/master_slave_kill/CMakeLists.txt
   examples/scala/CMakeLists.txt
   examples/scala/master_slave_bypass/CMakeLists.txt
   examples/scala/master_slave_kill/CMakeLists.txt