Rename kernel::activity::Synchro into kernel::activity::ActivityImpl

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

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index f28e62d..61af940 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -31,7 +31,7 @@ set(EXTRA_DIST
   src/simix/smx_private.h
   src/simix/ActorImpl.hpp
   src/simix/smx_synchro_private.h
-  src/kernel/activity/Synchro.h
+  src/kernel/activity/ActivityImpl.hpp
   src/kernel/activity/SynchroComm.hpp
   src/kernel/activity/SynchroExec.hpp
   src/kernel/activity/SynchroIo.hpp
@@ -340,8 +340,9 @@ set(SIMIX_SRC
   src/kernel/future.cpp
   src/simix/libsmx.cpp
   src/simix/smx_context.cpp
-  src/simix/Context.cpp
-  src/simix/ContextRaw.cpp
+  src/kernel/context/Context.cpp
+  src/kernel/context/Context.hpp
+  src/kernel/context/ContextRaw.cpp
   src/simix/smx_deployment.cpp
   src/simix/smx_environment.cpp
   src/simix/smx_global.cpp
@@ -352,7 +353,7 @@ set(SIMIX_SRC
   src/simix/smx_synchro.cpp
   src/simix/smx_vm.cpp
   src/simix/popping.cpp
-  src/kernel/activity/Synchro.cpp
+  src/kernel/activity/ActivityImpl.cpp
   src/kernel/activity/SynchroComm.cpp
   src/kernel/activity/SynchroExec.cpp
   src/kernel/activity/SynchroSleep.cpp
@@ -366,13 +367,13 @@ set(SIMIX_SRC
 if (HAVE_BOOST_CONTEXTS)
   set(SIMIX_SRC
       ${SIMIX_SRC}
-      src/simix/ContextBoost.hpp
-      src/simix/ContextBoost.cpp)
+      src/kernel/context/ContextBoost.hpp
+      src/kernel/context/ContextBoost.cpp)
 else()
   set(EXTRA_DIST
       ${EXTRA_DIST}
-      src/simix/ContextBoost.hpp
-      src/simix/ContextBoost.cpp)
+      src/kernel/context/ContextBoost.hpp
+      src/kernel/context/ContextBoost.cpp)
 endif()
 
 set(S4U_SRC
@@ -719,11 +720,11 @@ set(source_of_generated_headers
 ### depend of some variables setted upper
 # -->HAVE_THREAD_CONTEXTS HAVE_UCONTEXT_CONTEXTS
 if(${HAVE_THREAD_CONTEXTS}) #pthread
-  set(SURF_SRC   ${SURF_SRC}   src/simix/ContextThread.cpp
-                               src/simix/ContextThread.hpp )
+  set(SURF_SRC   ${SURF_SRC}   src/kernel/context/ContextThread.cpp
+                               src/kernel/context/ContextThread.hpp )
 else() # NOT pthread
-  set(EXTRA_DIST ${EXTRA_DIST} src/simix/ContextThread.cpp
-                               src/simix/ContextThread.hpp )
+  set(EXTRA_DIST ${EXTRA_DIST} src/kernel/context/ContextThread.cpp
+                               src/kernel/context/ContextThread.hpp )
 endif()
 
 if(${HAVE_THREAD_CONTEXTS}) #pthread
@@ -734,9 +735,9 @@ else() # NOT pthread
 endif()
 
 if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
-  set(SURF_SRC    ${SURF_SRC}   src/simix/ContextUnix.cpp)
+  set(SURF_SRC    ${SURF_SRC}   src/kernel/context/ContextUnix.cpp)
 else() # NOT ucontext
-  set(EXTRA_DIST  ${EXTRA_DIST} src/simix/ContextUnix.cpp)
+  set(EXTRA_DIST  ${EXTRA_DIST} src/kernel/context/ContextUnix.cpp)
 endif()
 
 ### Simgrid Lib sources
@@ -775,8 +776,8 @@ endif()
 if(WIN32)
   set(simgrid_sources
     ${simgrid_sources}
-    src/simix/ContextThread.cpp
-    src/simix/ContextThread.hpp
+    src/kernel/context/ContextThread.cpp
+    src/kernel/context/ContextThread.hpp
     src/xbt/xbt_os_thread.c
     )
 endif()