X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ca2d61f8f4e7d4f82a4dc9bd909188eeb870bc9f..71a5eb97d50eadd3edf7623d21dd3c1c4e235971:/examples/msg/mc/CMakeLists.txt

diff --git a/examples/msg/mc/CMakeLists.txt b/examples/msg/mc/CMakeLists.txt
index e11ce0b4a0..fb51f84e29 100644
--- a/examples/msg/mc/CMakeLists.txt
+++ b/examples/msg/mc/CMakeLists.txt
@@ -1,85 +1,84 @@
 cmake_minimum_required(VERSION 2.6)
 
 if(HAVE_MC)
-set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+  set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 
-add_executable(centralized centralized_mutex.c)
-add_executable(bugged1     bugged1.c)
-add_executable(bugged2      bugged2.c)
-add_executable(bugged3	   bugged3.c)
-add_executable(random_test random_test.c)
-add_executable(bugged1_for_liveness bugged1_for_liveness.c)
-add_executable(bugged1_while_liveness bugged1_while_liveness.c)
-add_executable(bugged2_liveness bugged2_liveness.c)
-add_executable(centralized_liveness centralized_liveness.c)
-add_executable(centralized_liveness_deadlock centralized_liveness_deadlock.c)
-add_executable(test_snapshot test_snapshot.c)
+  add_executable(centralized centralized_mutex.c)
+  add_executable(bugged1     bugged1.c)
+  add_executable(bugged2      bugged2.c)
+  add_executable(bugged3	   bugged3.c)
+  add_executable(electric_fence	   electric_fence.c)
+  add_executable(bugged1_liveness bugged1_liveness.c)
+  add_executable(bugged2_liveness bugged2_liveness.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_for_liveness     simgrid m )
-target_link_libraries(bugged1_while_liveness     simgrid m )
-target_link_libraries(bugged2_liveness     simgrid m )
-target_link_libraries(centralized_liveness     simgrid m )
-target_link_libraries(centralized_liveness_deadlock     simgrid m )
-target_link_libraries(test_snapshot     simgrid m )
-endif(HAVE_MC)
+  target_link_libraries(centralized simgrid )
+  target_link_libraries(bugged1     simgrid )
+  target_link_libraries(bugged2     simgrid )
+  target_link_libraries(bugged3     simgrid )
+  target_link_libraries(electric_fence     simgrid )
+  target_link_libraries(bugged1_liveness     simgrid )
+    target_link_libraries(bugged2_liveness     simgrid )
+
+  if(HAVE_C_STACK_CLEANER)
+    add_executable(bugged1_liveness_cleaner_on     bugged1_liveness.c )
+    add_executable(bugged1_liveness_cleaner_off     bugged1_liveness.c )
+
+    target_link_libraries(bugged1_liveness_cleaner_on     simgrid )
+    target_link_libraries(bugged1_liveness_cleaner_off     simgrid )
+
+    set_target_properties(bugged1_liveness_cleaner_on
+      PROPERTIES COMPILE_FLAGS "-DGARBAGE_STACK -fstack-cleaner")
+    set_target_properties(bugged1_liveness_cleaner_off
+      PROPERTIES COMPILE_FLAGS "-DGARBAGE_STACK -fno-stack-cleaner")
+  endif()
+
+endif()
 
 set(tesh_files
   ${tesh_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/bugged1.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/bugged2.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_liveness.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_liveness_visited.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_liveness_sparse.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_liveness_visited_sparse.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/centralized.tesh
   PARENT_SCOPE
-)
+  )
 set(xml_files
   ${xml_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged1_liveness.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged1_liveness_visited.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged1.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged2_liveness.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged2.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/deploy_bugged3.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/deploy_centralized_liveness.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deploy_electric_fence.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/deploy_mutex.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/deploy_random_test.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml
   PARENT_SCOPE
-)
+  )
 set(examples_src
   ${examples_src}
   ${CMAKE_CURRENT_SOURCE_DIR}/bugged1.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_for_liveness.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_while_liveness.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_liveness.c
   ${CMAKE_CURRENT_SOURCE_DIR}/bugged2.c
   ${CMAKE_CURRENT_SOURCE_DIR}/bugged2_liveness.c
   ${CMAKE_CURRENT_SOURCE_DIR}/bugged3.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/centralized_liveness.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/centralized_liveness_deadlock.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/electric_fence.c
   ${CMAKE_CURRENT_SOURCE_DIR}/centralized_mutex.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/random_test.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_snapshot.c
   ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_liveness.h
   ${CMAKE_CURRENT_SOURCE_DIR}/bugged2_liveness.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/centralized_liveness.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_snapshot.h
   PARENT_SCOPE
-)
+  )
 set(bin_files
   ${bin_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/dwarf
-  ${CMAKE_CURRENT_SOURCE_DIR}/parse_dwarf
-  ${CMAKE_CURRENT_SOURCE_DIR}/promela1_bugged1_liveness
-  ${CMAKE_CURRENT_SOURCE_DIR}/promela2_bugged1_liveness
-  ${CMAKE_CURRENT_SOURCE_DIR}/promela2_bugged2_liveness
-  ${CMAKE_CURRENT_SOURCE_DIR}/promela2_centralized_liveness
+  ${CMAKE_CURRENT_SOURCE_DIR}/promela_bugged1_liveness
   ${CMAKE_CURRENT_SOURCE_DIR}/promela_bugged2_liveness
-  ${CMAKE_CURRENT_SOURCE_DIR}/promela_centralized_liveness
+  ${CMAKE_CURRENT_SOURCE_DIR}/bugged1_liveness_stack_cleaner
   PARENT_SCOPE
-)
+  )
 set(txt_files
   ${txt_files}
   PARENT_SCOPE
-)
+  )