resolve cmakelists conflict

[simgrid.git] / examples / msg / mc / CMakeLists.txt

diff --git a/examples/msg/mc/CMakeLists.txt b/examples/msg/mc/CMakeLists.txt
index 2e18bb0..784334c 100644 (file)
--- a/examples/msg/mc/CMakeLists.txt
+++ b/examples/msg/mc/CMakeLists.txt
@@ -20,26 +20,33 @@ if(HAVE_MC)
   add_executable(test/snapshot_comparison4 test/snapshot_comparison4.c)
   add_executable(test/snapshot_comparison5 test/snapshot_comparison5.c)
 
-  target_link_libraries(centralized simgrid m )
-  target_link_libraries(bugged1     simgrid m )
-  target_link_libraries(bugged2     simgrid m )
-  target_link_libraries(bugged3     simgrid m )
-  target_link_libraries(random_test     simgrid m )
-  target_link_libraries(bugged1_liveness     simgrid m )
-  target_link_libraries(bugged2_liveness     simgrid m )
-  target_link_libraries(chord/chord_liveness     simgrid m )
-  target_link_libraries(test/snapshot_comparison1     simgrid m )
-  target_link_libraries(test/snapshot_comparison2     simgrid m )
-  target_link_libraries(test/snapshot_comparison3     simgrid m )
-  target_link_libraries(test/snapshot_comparison4     simgrid m )
-  target_link_libraries(test/snapshot_comparison5     simgrid m )
+  target_link_libraries(centralized simgrid )
+  target_link_libraries(bugged1     simgrid )
+  target_link_libraries(bugged2     simgrid )
+  target_link_libraries(bugged3     simgrid )
+  target_link_libraries(random_test     simgrid )
+  target_link_libraries(bugged1_liveness     simgrid )
+  target_link_libraries(bugged2_liveness     simgrid )
+  target_link_libraries(chord/chord_liveness     simgrid )
+  target_link_libraries(test/snapshot_comparison1     simgrid )
+  target_link_libraries(test/snapshot_comparison2     simgrid )
+  target_link_libraries(test/snapshot_comparison3     simgrid )
+  target_link_libraries(test/snapshot_comparison4     simgrid )
+  target_link_libraries(test/snapshot_comparison5     simgrid )
 
 endif()
 
 set(tesh_files
   ${tesh_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/bugged1.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_liveness.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/centralized.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/chord/chord_neverjoin.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison1.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison2.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison3.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison4.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison5.tesh
   PARENT_SCOPE
   )
 set(xml_files
@@ -54,6 +61,7 @@ set(xml_files
   ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/chord/deploy_chord_liveness.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/test/deploy_snapshot_comparison.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/snapshot_comparison_platform.xml
   PARENT_SCOPE
   )
 set(examples_src