X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/124b3dee9ed0b4342bc495061c2a5167a9fc6318..e246a8f6ea9c3d407d5f9fd21b4b70e25d1a7d4e:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index f7a60cf060..5b3a7182da 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -13,9 +13,7 @@ set(EXTRA_DIST
   src/include/surf/datatypes.h
   src/include/surf/maxmin.h
   src/include/surf/surf.h
-  src/include/xbt/wine_dbghelp.h
   src/msg/msg_private.h
-  src/portable.h
   src/simdag/dax.dtd
   src/simdag/dax_dtd.c
   src/simdag/dax_dtd.h
@@ -60,20 +58,23 @@ set(EXTRA_DIST
   src/surf/xml/simgrid_dtd.h
   src/surf/xml/simgrid_dtd.c
   src/surf/xml/surfxml_sax_cb.cpp
+
+  src/surf/AsImpl.hpp
+  src/surf/AsCluster.hpp
+  src/surf/AsClusterFatTree.hpp
+  src/surf/AsClusterTorus.hpp
+  src/surf/AsDijkstra.hpp
+  src/surf/AsFloyd.hpp
+  src/surf/AsFull.hpp
+  src/surf/AsRoutedGraph.hpp
+  src/surf/AsNone.hpp
+  src/surf/AsVivaldi.hpp
+
   src/surf/storage_interface.hpp
   src/surf/storage_n11.hpp
   src/surf/surf_interface.hpp
   src/surf/surf_private.h
   src/surf/surf_routing.hpp
-  src/surf/surf_routing_cluster.hpp
-  src/surf/surf_routing_cluster_fat_tree.hpp
-  src/surf/surf_routing_cluster_torus.hpp
-  src/surf/surf_routing_dijkstra.hpp
-  src/surf/surf_routing_floyd.hpp
-  src/surf/surf_routing_full.hpp
-  src/surf/surf_routing_RoutedGraph.hpp
-  src/surf/surf_routing_none.hpp
-  src/surf/surf_routing_vivaldi.hpp
   src/surf/vm_hl13.hpp
   src/surf/PropertyHolder.hpp
   src/surf/virtual_machine.hpp
@@ -87,7 +88,6 @@ set(EXTRA_DIST
   src/xbt/automaton/parserPromela.yacc
   src/xbt/backtrace_dummy.c
   src/xbt/backtrace_linux.c
-  src/xbt/backtrace_windows.c
   src/xbt/dict_private.h
   src/xbt/ex_interface.h
   src/xbt/fifo_private.h
@@ -291,6 +291,17 @@ set(NS3_SRC
   )
 
 set(SURF_SRC
+  src/surf/AsImpl.cpp
+  src/surf/AsCluster.cpp
+  src/surf/AsClusterFatTree.cpp
+  src/surf/AsClusterTorus.cpp
+  src/surf/AsDijkstra.cpp
+  src/surf/AsFloyd.cpp
+  src/surf/AsFull.cpp
+  src/surf/AsRoutedGraph.cpp
+  src/surf/AsNone.cpp
+  src/surf/AsVivaldi.cpp
+  
   src/surf/cpu_cas01.cpp
   src/surf/cpu_interface.cpp
   src/surf/cpu_ti.cpp
@@ -312,15 +323,6 @@ set(SURF_SRC
   src/surf/surf_c_bindings.cpp
   src/surf/surf_interface.cpp
   src/surf/surf_routing.cpp
-  src/surf/surf_routing_cluster.cpp
-  src/surf/surf_routing_cluster_fat_tree.cpp
-  src/surf/surf_routing_cluster_torus.cpp
-  src/surf/surf_routing_dijkstra.cpp
-  src/surf/surf_routing_floyd.cpp
-  src/surf/surf_routing_full.cpp
-  src/surf/surf_routing_RoutedGraph.cpp
-  src/surf/surf_routing_none.cpp
-  src/surf/surf_routing_vivaldi.cpp
   src/surf/xml/platf.hpp
   src/surf/xml/platf_private.hpp
   src/surf/xml/surfxml_sax_cb.cpp
@@ -547,6 +549,10 @@ set(MC_SRC
   src/mc/RemotePtr.hpp
   src/mc/AddressSpace.hpp
   src/mc/AddressSpace.cpp
+  src/mc/Channel.cpp
+  src/mc/Channel.hpp
+  src/mc/Client.cpp
+  src/mc/Client.hpp
   src/mc/Frame.hpp
   src/mc/Frame.cpp
   src/mc/ModelChecker.hpp
@@ -570,7 +576,6 @@ set(MC_SRC
   src/mc/mc_unw.h
   src/mc/mc_unw.cpp
   src/mc/mc_unw_vmread.cpp
-  src/mc/mc_object_info.h
   src/mc/mc_checkpoint.cpp
   src/mc/mc_snapshot.h
   src/mc/mc_snapshot.cpp
@@ -588,7 +593,6 @@ set(MC_SRC
   src/mc/mc_dwarf_tagnames.cpp
   src/mc/mc_hash.hpp
   src/mc/mc_hash.cpp
-  src/mc/mc_ignore.cpp
   src/mc/mc_ignore.h
   src/mc/mc_mmalloc.h
   src/mc/mc_liveness.h
@@ -606,9 +610,7 @@ set(MC_SRC
   src/mc/mc_state.h
   src/mc/mc_state.cpp
   src/mc/mc_visited.cpp
-  src/mc/mc_client.cpp
   src/mc/mc_client_api.cpp
-  src/mc/mc_client.h
   src/mc/mc_protocol.h
   src/mc/mc_protocol.cpp
   src/mc/mc_smx.h
@@ -641,7 +643,7 @@ set(headers_to_install
   include/simgrid/link.h
   include/simgrid/s4u/forward.hpp
   include/simgrid/s4u/actor.hpp
-  include/simgrid/s4u/as.hpp
+  include/simgrid/s4u/As.hpp
   include/simgrid/s4u/async.hpp
   include/simgrid/s4u/comm.hpp
   include/simgrid/s4u/engine.hpp  
@@ -679,6 +681,7 @@ set(headers_to_install
   include/xbt/log.h
   include/xbt/mallocator.h
   include/xbt/matrix.h
+  include/xbt/memory.hpp
   include/xbt/misc.h
   include/xbt/mmalloc.h
   include/xbt/module.h
@@ -781,7 +784,7 @@ if(WIN32)
     )
 endif()
 
-if(${HAVE_LUA})
+if(HAVE_LUA)
   set(simgrid_sources  ${simgrid_sources}  ${LUA_SRC})
 else()
   set(EXTRA_DIST       ${EXTRA_DIST}       ${LUA_SRC})
@@ -982,6 +985,7 @@ set(CMAKEFILES_TXT
   examples/simdag/scheduling/CMakeLists.txt
   
   examples/smpi/CMakeLists.txt
+  examples/smpi/NAS/CMakeLists.txt
   examples/smpi/smpi_msg_masterslave/CMakeLists.txt
   examples/smpi/replay_multiple/CMakeLists.txt
   examples/smpi/energy/CMakeLists.txt
@@ -1093,6 +1097,7 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/scripts/IPC/Run/Win32Helper.pm
   tools/cmake/scripts/IPC/Run/Win32IO.pm
   tools/cmake/scripts/IPC/Run/Win32Pump.pm
+  tools/cmake/scripts/IPC/Win32APIFile.pm
   tools/cmake/scripts/Diff.pm
   tools/cmake/scripts/generate_memcheck_tests.pl
   tools/cmake/scripts/my_valgrind.pl