merge conflicts

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

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index c43b79a..e2e3abb 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -17,6 +17,7 @@ set(EXTRA_DIST
        src/xbt/backtrace_dummy.c
        src/xbt/setset_private.h
        src/xbt/parmap_private.h
+       src/xbt/automatonparse_promela.c
        src/xbt/mmalloc/attach.c
        src/xbt/mmalloc/detach.c        
        src/xbt/mmalloc/keys.c
@@ -48,12 +49,13 @@ set(EXTRA_DIST
        src/surf/gtnets/gtnets_topology.h
        src/surf/cpu_ti_private.h
        src/surf/surf_routing_private.h
+       src/include/simgrid/platf_interface.h
        src/include/surf/surf_resource.h
        src/include/surf/datatypes.h
        src/include/surf/maxmin.h
        src/include/surf/trace_mgr.h
        src/include/surf/surf.h
-       src/include/surf/surfxml_parse_private.h
+       src/include/surf/surfxml_parse_values.h
        src/include/surf/random_mgr.h
        src/include/surf/surf_resource_lmm.h
        src/include/xbt/wine_dbghelp.h
@@ -62,8 +64,8 @@ set(EXTRA_DIST
        src/include/mc/datatypes.h
        src/include/mc/mc.h
        src/include/simix/context.h
-       src/msg/private.h
-       src/msg/mailbox.h
+       src/msg/msg_private.h
+       src/msg/msg_mailbox.h
        src/simdag/private.h
        src/simdag/dax.dtd
        src/simdag/dax_dtd.h
@@ -179,6 +181,7 @@ set(XBT_SRC
        src/xbt/parmap.c
        src/xbt/xbt_replay_trace_reader.c
        src/xbt/lib.c
+       src/xbt/automaton.c
 )
 
 if(HAVE_MMAP)
@@ -207,11 +210,14 @@ set(SURF_SRC
        src/surf/surf_model.c
        src/surf/surf_action.c
        src/surf/surf_routing.c
+       src/surf/surf_routing_none.c
+       src/surf/surf_routing_generic.c
        src/surf/surf_routing_full.c
        src/surf/surf_routing_floyd.c
        src/surf/surf_routing_rulebased.c
        src/surf/surf_routing_dijkstra.c
-       src/surf/surf_routing_none.c
+       src/surf/surf_routing_cluster.c
+       src/surf/surf_routing_vivaldi.c
        src/surf/surf_config.c
        src/surf/maxmin.c
        src/surf/fair_bottleneck.c
@@ -220,6 +226,7 @@ set(SURF_SRC
        src/surf/random_mgr.c
        src/surf/surf.c
        src/surf/surfxml_parse.c
+       src/surf/surfxml_parseplatf.c
        src/surf/cpu.c
        src/surf/network.c
        src/surf/network_im.c
@@ -228,6 +235,7 @@ set(SURF_SRC
        src/surf/workstation_ptask_L07.c
        src/surf/cpu_ti.c
        src/surf/cpu_im.c
+       src/surf/sg_platf.c
        src/xbt/xbt_sg_stubs.c
 )
 
@@ -248,13 +256,13 @@ set(SIMIX_SRC
 
 set(MSG_SRC
        src/msg/msg_config.c
-       src/msg/task.c
-       src/msg/host.c
-       src/msg/m_process.c
-       src/msg/gos.c
-       src/msg/global.c
-       src/msg/environment.c
-       src/msg/deployment.c
+       src/msg/msg_task.c
+       src/msg/msg_host.c
+       src/msg/msg_process.c
+       src/msg/msg_gos.c
+       src/msg/msg_global.c
+       src/msg/msg_environment.c
+       src/msg/msg_deployment.c
        src/msg/msg_mailbox.c
        src/msg/msg_actions.c
 )
@@ -322,6 +330,8 @@ set(LUA_SRC
        src/bindings/lua/simgrid_lua.c
        src/bindings/lua/lua_stub_generator.c
        src/bindings/lua/lua_console.c
+        src/bindings/lua/lua_utils.c
+        src/bindings/lua/lua_state_cloner.c
 )
 
 set(TRACING_SRC
@@ -360,6 +370,7 @@ set(MC_SRC
        src/mc/mc_dpor.c
        src/mc/mc_request.c
        src/mc/private.h
+       src/mc/mc_liveness.c
 )
 
 set(RNGSTREAM_SRC
@@ -402,6 +413,9 @@ set(headers_to_install
        include/xbt/mmalloc.h
        include/xbt/replay_trace_reader.h
        include/xbt/parmap.h
+       include/xbt/automaton.h
+       include/xbt/automatonparse_promela.h
+       include/simgrid/platf.h
        include/mc/modelchecker.h
        include/msg/msg.h
        include/msg/datatypes.h