rename AsRoute to BypassRoute, and move it to its own file

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

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index fe13386..7d5b8d4 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -73,7 +73,9 @@ set(EXTRA_DIST
   src/kernel/routing/AsFull.hpp
   src/kernel/routing/AsRoutedGraph.hpp
   src/kernel/routing/AsNone.hpp
-  src/kernel/routing/AsVivaldi.hpp
+  src/kernel/routing/AsVivaldi.hpp  
+  src/kernel/routing/BypassRoute.hpp
+  src/kernel/routing/NetCard.hpp
 
   src/surf/storage_interface.hpp
   src/surf/storage_n11.hpp
@@ -81,7 +83,6 @@ set(EXTRA_DIST
   src/surf/surf_private.h
   src/surf/surf_routing.hpp
   src/surf/PropertyHolder.hpp
-  src/surf/virtual_machine.hpp
   src/surf/host_clm03.hpp
   src/surf/HostImpl.hpp
   src/surf/ptask_L07.hpp
@@ -242,6 +243,9 @@ set(SMPI_SRC
   src/smpi/smpi_topo.cpp
   src/smpi/smpi_utils.cpp
   src/smpi/smpi_f77.cpp
+  
+  src/surf/network_smpi.cpp
+  src/surf/network_ib.cpp
   )
 
 set(XBT_SRC
@@ -303,7 +307,10 @@ set(SURF_SRC
   src/kernel/routing/AsRoutedGraph.cpp
   src/kernel/routing/AsNone.cpp
   src/kernel/routing/AsVivaldi.cpp
-  
+
+  src/kernel/EngineImpl.cpp
+  src/kernel/EngineImpl.hpp
+
   src/surf/cpu_cas01.cpp
   src/surf/cpu_interface.cpp
   src/surf/cpu_ti.cpp
@@ -315,8 +322,6 @@ set(SURF_SRC
   src/surf/network_cm02.cpp
   src/surf/network_constant.cpp
   src/surf/network_interface.cpp
-  src/surf/network_smpi.cpp
-  src/surf/network_ib.cpp
   src/surf/plugins/energy.cpp
   src/surf/PropertyHolder.cpp
   src/surf/sg_platf.cpp
@@ -331,12 +336,19 @@ set(SURF_SRC
   src/surf/xml/surfxml_parseplatf.cpp
   src/surf/trace_mgr.hpp
   src/surf/trace_mgr.cpp
-  src/surf/virtual_machine.cpp
   src/surf/host_clm03.cpp
   src/surf/HostImpl.cpp
   src/surf/ptask_L07.cpp
   )
 
+set(PLUGINS_SRC
+  src/plugins/vm/s4u_VirtualMachine.cpp
+  src/plugins/vm/VirtualMachineImpl.hpp
+  src/plugins/vm/VirtualMachineImpl.cpp
+  src/plugins/vm/VmHostExt.hpp
+  src/plugins/vm/VmHostExt.cpp
+  )
+  
 set(SIMIX_GENERATED_SRC   src/simix/popping_generated.cpp  )
 set(SIMIX_SRC
   src/kernel/future.cpp
@@ -401,7 +413,6 @@ set(SIMGRID_SRC
 set(MSG_SRC
   src/msg/instr_msg_process.cpp
   src/msg/instr_msg_task.cpp
-  src/msg/instr_msg_vm.cpp
   src/msg/msg_actions.cpp
   src/msg/msg_deployment.cpp
   src/msg/msg_environment.cpp
@@ -418,15 +429,11 @@ set(MSG_SRC
 
 set(SIMDAG_SRC
   src/simdag/sd_daxloader.cpp
+  src/simdag/sd_dotloader.cpp
   src/simdag/sd_global.cpp
   src/simdag/sd_task.cpp
   src/simdag/sd_workstation.cpp
   )
-if(HAVE_GRAPHVIZ)
-  set(SIMDAG_SRC    ${SIMDAG_SRC} src/simdag/sd_dotloader.cpp)
-else()
-  set(EXTRA_DIST    ${EXTRA_DIST} src/simdag/sd_dotloader.cpp)
-endif()
 
 set(BINDINGS_SRC
   src/bindings/lua/lua_private.h
@@ -523,12 +530,12 @@ set(TRACING_SRC
   )
 
 set(JEDULE_SRC
-  include/simgrid/jedule/jedule_events.h
-  include/simgrid/jedule/jedule_output.h
-  include/simgrid/jedule/jedule_platform.h
+  include/simgrid/jedule/jedule_events.hpp
+  include/simgrid/jedule/jedule.hpp
+  include/simgrid/jedule/jedule_platform.hpp
   include/simgrid/jedule/jedule_sd_binding.h
   src/instr/jedule/jedule_events.cpp
-  src/instr/jedule/jedule_output.cpp
+  src/instr/jedule/jedule.cpp
   src/instr/jedule/jedule_platform.cpp
   src/instr/jedule/jedule_sd_binding.cpp
   )
@@ -656,6 +663,7 @@ set(headers_to_install
   include/simgrid/s4u/Mutex.hpp
   include/simgrid/s4u/conditionVariable.hpp
   include/simgrid/s4u/storage.hpp  
+  include/simgrid/s4u/VirtualMachine.hpp  
   include/simgrid/s4u.hpp
   include/simgrid/plugins/energy.h
   include/smpi/mpi.h
@@ -706,7 +714,7 @@ set(headers_to_install
   include/xbt/str.h
   include/xbt/strbuff.h
   include/xbt/swag.h
-  include/xbt/synchro_core.h
+  include/xbt/synchro.h
   include/xbt/sysdep.h
   include/xbt/system_error.hpp
   include/xbt/utility.hpp
@@ -743,6 +751,7 @@ endif()
 
 ### Simgrid Lib sources
 set(simgrid_sources
+  ${PLUGINS_SRC}
   ${BINDINGS_SRC}
   ${MC_SRC_BASE}
   ${MSG_SRC}
@@ -848,14 +857,14 @@ set(DOC_SOURCES
   doc/doxygen/stylesheet.css
   doc/doxygen/uhood.doc
   doc/doxygen/uhood_switch.doc
+  doc/doxygen/uhood_arch.doc
 
   doc/manpage/smpicc.1
   doc/manpage/smpicxx.1
   doc/manpage/smpif90.1
   doc/manpage/smpiff.1
   doc/manpage/smpirun.1
-
-  tools/tesh/tesh.pod
+  doc/manpage/tesh.pod
 
   doc/msg-tuto-src/deployment0.xml
   doc/msg-tuto-src/deployment1.xml
@@ -1000,10 +1009,10 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/Java.cmake
   tools/cmake/MakeLib.cmake
   tools/cmake/MakeLibWin.cmake
-  tools/cmake/Modules/FindGFortran.cmake
   tools/cmake/Modules/FindGraphviz.cmake
   tools/cmake/Modules/FindLibdw.cmake
   tools/cmake/Modules/FindLibunwind.cmake
+  tools/cmake/Modules/FindLibevent.cmake
   tools/cmake/Modules/FindLuaSimgrid.cmake
   tools/cmake/Modules/FindNS3.cmake
   tools/cmake/Modules/FindPAPI.cmake
@@ -1011,14 +1020,6 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/Modules/FindSimGrid.cmake
   tools/cmake/Modules/FindValgrind.cmake
   tools/cmake/Option.cmake
-  tools/cmake/scripts/IPC/Run.pm
-  tools/cmake/scripts/IPC/Run/Debug.pm
-  tools/cmake/scripts/IPC/Run/IO.pm
-  tools/cmake/scripts/IPC/Run/Timer.pm
-  tools/cmake/scripts/IPC/Run/Win32Helper.pm
-  tools/cmake/scripts/IPC/Run/Win32IO.pm
-  tools/cmake/scripts/IPC/Run/Win32Pump.pm
-  tools/cmake/scripts/Diff.pm
   tools/cmake/scripts/my_valgrind.pl
   tools/cmake/scripts/update_tesh.pl
   tools/cmake/UnitTesting.cmake