merge conflicts

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

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 122b703..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
@@ -54,7 +55,6 @@ set(EXTRA_DIST
        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
@@ -64,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
@@ -89,6 +89,7 @@ set(EXTRA_DIST
        src/smpi/private.h
        src/smpi/smpi_mpi_dt_private.h
        src/smpi/README
+       src/mk_supernovae.pl
        
        examples/gras/ping/ping.h
        examples/gras/console/ping.h
@@ -180,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)
@@ -254,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
 )
@@ -368,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
@@ -410,6 +413,8 @@ 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