change name of some targets for mc, to avoid warnings by recent cmake

diff --git a/examples/smpi/CMakeLists.txt b/examples/smpi/CMakeLists.txt
index b3709c7..4b94226 100644 (file)
--- a/examples/smpi/CMakeLists.txt
+++ b/examples/smpi/CMakeLists.txt
@@ -19,28 +19,30 @@ if(enable_smpi)
   add_executable(smpi_traced_simple tracing/smpi_traced_simple.c)
   add_executable(smpi_replay replay/replay.c)
 
-  if(HAVE_MC)
-    add_executable(mc/bugged1 mc/bugged1.c)
-    add_executable(mc/bugged2 mc/bugged2.c)
-    add_executable(mc/bugged1_liveness mc/bugged1_liveness.c)
-    add_executable(mc/send_deterministic mc/send_deterministic.c)
-    add_executable(mc/non_deterministic mc/non_deterministic.c)
-    add_executable(mc/mutual_exclusion mc/mutual_exclusion.c)
-
-    target_link_libraries(mc/bugged1 simgrid)
-    target_link_libraries(mc/bugged2 simgrid)
-    target_link_libraries(mc/bugged1_liveness simgrid)
-    target_link_libraries(mc/send_deterministic simgrid)
-    target_link_libraries(mc/non_deterministic simgrid)
-    target_link_libraries(mc/mutual_exclusion simgrid)
-  endif()
-
   target_link_libraries(bcbench simgrid)
   target_link_libraries(mvmul simgrid)
   target_link_libraries(smpi_traced simgrid)
   target_link_libraries(smpi_traced_simple simgrid)
   target_link_libraries(smpi_replay simgrid)
 
+  if(HAVE_MC)
+    SET(EXECUTABLE_OUTPUT_PATH "./mc/")
+
+    add_executable(smpi_bugged1 mc/bugged1.c)
+    add_executable(smpi_bugged2 mc/bugged2.c)
+    add_executable(smpi_bugged1_liveness mc/bugged1_liveness.c)
+    add_executable(smpi_send_deterministic mc/send_deterministic.c)
+    add_executable(smpi_non_deterministic mc/non_deterministic.c)
+    add_executable(smpi_mutual_exclusion mc/mutual_exclusion.c)
+
+    target_link_libraries(smpi_bugged1 simgrid)
+    target_link_libraries(smpi_bugged2 simgrid)
+    target_link_libraries(smpi_bugged1_liveness simgrid)
+    target_link_libraries(smpi_send_deterministic simgrid)
+    target_link_libraries(smpi_non_deterministic simgrid)
+    target_link_libraries(smpi_mutual_exclusion simgrid)
+  endif()
+  
 endif()
 
 set(tesh_files

diff --git a/examples/smpi/mc/non_deterministic.tesh b/examples/smpi/mc/non_deterministic.tesh
index f4730df..d32f46a 100644 (file)
--- a/examples/smpi/mc/non_deterministic.tesh
+++ b/examples/smpi/mc/non_deterministic.tesh
@@ -1,7 +1,7 @@
 #! ./tesh
 
 ! timeout 60
-$ ../../../smpi_script/bin/smpirun -hostfile ${srcdir:=.}/hostfile_non_deterministic  -platform ${srcdir:=.}/../../platforms/cluster.xml --cfg=model-check:1 --cfg=model-check/communications_determinism:1 --cfg=smpi/send_is_detached_thres:0 --cfg=smpi/running_power:1e9 ./non_deterministic
+$ ../../../smpi_script/bin/smpirun -hostfile ${srcdir:=.}/hostfile_non_deterministic  -platform ${srcdir:=.}/../../platforms/cluster.xml --cfg=model-check:1 --cfg=model-check/communications_determinism:1 --cfg=smpi/send_is_detached_thres:0 --cfg=smpi/running_power:1e9 ./smpi_non_deterministic
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304'

diff --git a/examples/smpi/mc/send_deterministic.tesh b/examples/smpi/mc/send_deterministic.tesh
index c952d18..6bafa97 100644 (file)
--- a/examples/smpi/mc/send_deterministic.tesh
+++ b/examples/smpi/mc/send_deterministic.tesh
@@ -1,7 +1,7 @@
 #! ./tesh
 
 ! timeout 60
-$ ../../../smpi_script/bin/smpirun -hostfile ${srcdir:=.}/hostfile_send_deterministic  -platform ${srcdir:=.}/../../platforms/cluster.xml --cfg=model-check:1 --cfg=model-check/send_determinism:1 --cfg=smpi/send_is_detached_thres:0 --cfg=smpi/running_power:1e9 ./send_deterministic
+$ ../../../smpi_script/bin/smpirun -hostfile ${srcdir:=.}/hostfile_send_deterministic  -platform ${srcdir:=.}/../../platforms/cluster.xml --cfg=model-check:1 --cfg=model-check/send_determinism:1 --cfg=smpi/send_is_detached_thres:0 --cfg=smpi/running_power:1e9 ./smpi_send_deterministic
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304'