various cleanups in the CMakeLists.txt files

[simgrid.git] / examples / smpi / CMakeLists.txt

diff --git a/examples/smpi/CMakeLists.txt b/examples/smpi/CMakeLists.txt
index 9afad64..9f1788a 100644 (file)
--- a/examples/smpi/CMakeLists.txt
+++ b/examples/smpi/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 2.6)
-
 if(enable_smpi)
   if(WIN32)
     set(CMAKE_C_FLAGS "-include ${CMAKE_HOME_DIRECTORY}/include/smpi/smpi_main.h")
@@ -7,51 +5,34 @@ if(enable_smpi)
     set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpicc")
   endif()
 
-  set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-
-  include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
+  include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi")
   file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/mc/")
 
+  add_executable       (bcbench            bcbench.c)
+  target_link_libraries(bcbench            simgrid)
+  add_executable       (mvmul              mvmul.c)
+  target_link_libraries(mvmul              simgrid)
+  add_executable       (smpi_traced        tracing/smpi_traced.c)
+  target_link_libraries(smpi_traced        simgrid)
+  add_executable       (smpi_traced_simple tracing/smpi_traced_simple.c)
+  target_link_libraries(smpi_traced_simple simgrid)
+  add_executable       (smpi_replay        replay/replay.c)
+  target_link_libraries(smpi_replay        simgrid)
 
-  add_executable(bcbench bcbench.c)
-  add_executable(mvmul mvmul.c)
-  add_executable(smpi_traced tracing/smpi_traced.c)
-  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)
-  
-    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)
+    foreach(x bugged1 bugged2 bugged1_liveness only_send_deterministic mutual_exclusion non_termination1 non_termination2 non_termination3 non_termination4)
+      add_executable       (smpi_${x} mc/${x}.c)
+      target_link_libraries(smpi_${x} simgrid)
+      set_target_properties(smpi_${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "./mc")
+    endforeach()    
   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)
-
 endif()
 
 set(tesh_files
   ${tesh_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/tracing/smpi_traced.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/replay/smpi_replay.tesh
-  PARENT_SCOPE
-  )
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/replay/replay_platform.xml
-  PARENT_SCOPE
-  )
+  PARENT_SCOPE)
 set(examples_src
   ${examples_src}
   ${CMAKE_CURRENT_SOURCE_DIR}/mvmul.c
@@ -62,10 +43,13 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/mc/bugged2.c
   ${CMAKE_CURRENT_SOURCE_DIR}/mc/bugged1.c
   ${CMAKE_CURRENT_SOURCE_DIR}/mc/bugged1_liveness.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/send_deterministic.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/non_deterministic.c
-  PARENT_SCOPE
-  )
+  ${CMAKE_CURRENT_SOURCE_DIR}/mc/only_send_deterministic.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mc/mutual_exclusion.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mc/non_termination1.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mc/non_termination2.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mc/non_termination3.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/mc/non_termination4.c
+  PARENT_SCOPE)
 set(bin_files
   ${bin_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/hostfile
@@ -73,10 +57,10 @@ set(bin_files
   ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_bugged1_liveness
   ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_bugged1
   ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_bugged2
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_send_deterministic
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_non_deterministic
-  PARENT_SCOPE
-  )
+  ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_only_send_deterministic
+  ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_mutual_exclusion
+  ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_non_termination
+  PARENT_SCOPE)
 set(txt_files
   ${txt_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions0.txt
@@ -93,5 +77,4 @@ set(txt_files
   ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_waitall.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_with_isend.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/replay/split_traces
-  PARENT_SCOPE
-  )  
+  PARENT_SCOPE)