X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/97e476dc536bfd9fada85509d1c1f93714d46a10..5e22041a2c1ba01ba5c2337e39ebd9a590780182:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 042419795f..a06425dc86 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -12,6 +12,7 @@ set(EXTRA_DIST
   src/include/xbt/xbt_modinter.h
   src/include/catch.hpp
   src/include/xxhash.hpp
+  src/kernel/actor/Simcall.hpp
   src/kernel/resource/LinkImpl.hpp
   src/kernel/resource/SplitDuplexLinkImpl.hpp
   src/kernel/resource/StandardLinkImpl.hpp
@@ -22,7 +23,6 @@ set(EXTRA_DIST
   src/dag/dax.dtd
   src/dag/dax_dtd.c
   src/dag/dax_dtd.h
-  src/simix/popping_private.hpp
   src/smpi/colls/coll_tuned_topo.hpp
   src/smpi/colls/colls_private.hpp
   src/smpi/colls/smpi_mvapich2_selector_stampede.hpp
@@ -310,8 +310,6 @@ set(SURF_SRC
   src/kernel/resource/VirtualMachineImpl.cpp
   src/kernel/resource/WifiLinkImpl.cpp
 
-  src/kernel/resource/profile/DatedValue.cpp
-  src/kernel/resource/profile/DatedValue.hpp
   src/kernel/resource/profile/Event.hpp
   src/kernel/resource/profile/FutureEvtSet.cpp
   src/kernel/resource/profile/FutureEvtSet.hpp
@@ -356,6 +354,17 @@ set(SURF_SRC
   src/surf/HostImpl.cpp
   src/surf/ptask_L07.cpp
   )
+if (Eigen3_FOUND)
+  set(SURF_SRC
+    ${SURF_SRC}
+    src/kernel/lmm/bmf.hpp
+    src/kernel/lmm/bmf.cpp)
+else()
+  set(EXTRA_DIST
+    ${EXTRA_DIST}
+    src/kernel/lmm/bmf.hpp
+    src/kernel/lmm/bmf.cpp)
+endif()
 
 set(PLUGINS_SRC
   src/plugins/ProducerConsumer.cpp
@@ -373,8 +382,6 @@ set(PLUGINS_SRC
   )
 
 set(SIMIX_SRC
-  src/simix/libsmx.cpp
-  src/simix/smx_context.cpp
   src/kernel/context/Context.cpp
   src/kernel/context/Context.hpp
   src/kernel/context/ContextRaw.cpp
@@ -383,7 +390,6 @@ set(SIMIX_SRC
   src/kernel/context/ContextSwapped.hpp
   src/kernel/context/ContextThread.cpp
   src/kernel/context/ContextThread.hpp
-  src/simix/popping.cpp
   src/kernel/activity/ActivityImpl.cpp
   src/kernel/activity/ActivityImpl.hpp
   src/kernel/activity/BarrierImpl.cpp
@@ -410,10 +416,13 @@ set(SIMIX_SRC
   src/kernel/actor/ActorImpl.hpp
   src/kernel/actor/CommObserver.cpp
   src/kernel/actor/CommObserver.hpp
+  src/kernel/actor/Simcall.cpp
   src/kernel/actor/SimcallObserver.cpp
   src/kernel/actor/SimcallObserver.hpp
   src/kernel/actor/SynchroObserver.cpp
   src/kernel/actor/SynchroObserver.hpp
+  src/simix/libsmx.cpp
+  src/simix/smx_context.cpp
   )
 
 # Boost context may not be available
@@ -555,8 +564,8 @@ set(MC_SRC_BASE
 set(MC_SRC
   src/mc/explo/Exploration.hpp
   src/mc/explo/CommunicationDeterminismChecker.cpp
-  src/mc/explo/SafetyChecker.cpp
-  src/mc/explo/SafetyChecker.hpp
+  src/mc/explo/DFSExplorer.cpp
+  src/mc/explo/DFSExplorer.hpp
   src/mc/explo/LivenessChecker.cpp
   src/mc/explo/LivenessChecker.hpp
   src/mc/explo/UdporChecker.cpp
@@ -800,7 +809,7 @@ if(SIMGRID_HAVE_NS3)
   set(headers_to_install ${headers_to_install} include/simgrid/plugins/ns3.hpp)
 
   set(simgrid_sources  ${simgrid_sources}  ${NS3_SRC})
-else()  
+else()
   set(EXTRA_DIST ${EXTRA_DIST} include/simgrid/plugins/ns3.hpp)
 endif()
 
@@ -1028,7 +1037,7 @@ set(CMAKEFILES_TXT
   teshsuite/surf/CMakeLists.txt
   teshsuite/xbt/CMakeLists.txt
 
-  teshsuite/smpi/isp/umpire/CMakeLists.txt
+  teshsuite/smpi/MBI/CMakeLists.txt
   teshsuite/smpi/mpich3-test/CMakeLists.txt
   teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
   teshsuite/smpi/mpich3-test/coll/CMakeLists.txt