X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5fa8d6780a107eb5ae1ff8a233b0dd23cb065f8a..d2a6882ed727ec836d89520998918056aa355cac:/examples/simdag/CMakeLists.txt

diff --git a/examples/simdag/CMakeLists.txt b/examples/simdag/CMakeLists.txt
index 02e1579ee9..6a1d6d2e21 100644
--- a/examples/simdag/CMakeLists.txt
+++ b/examples/simdag/CMakeLists.txt
@@ -1,26 +1,25 @@
-cmake_minimum_required(VERSION 2.6)
-
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 
 add_executable(ex_sd_test sd_test.c)
 add_executable(sd_test2 sd_test2.c)
 add_executable(sd_fail sd_fail.c)
+add_executable(sd_avail sd_avail.c)
 add_executable(sd_typed_tasks_test sd_typed_tasks_test.c)
 add_executable(sd_comm_throttling sd_comm_throttling.c)
 add_executable(sd_seq_access sd_seq_access.c)
-add_executable(sd_test_console sd_test_console.c)
+
 add_executable(simdag_tracing simdag_trace.c)
 
 ### Add definitions for compile
 if(NOT WIN32)
-  target_link_libraries(ex_sd_test simgrid pthread m )
-  target_link_libraries(sd_test2 simgrid pthread m )
-  target_link_libraries(sd_fail simgrid pthread m )
-  target_link_libraries(sd_typed_tasks_test simgrid pthread m )
-  target_link_libraries(sd_comm_throttling simgrid pthread m )
-  target_link_libraries(sd_seq_access simgrid pthread m )
-  target_link_libraries(sd_test_console simgrid pthread m )
-  target_link_libraries(simdag_tracing simgrid pthread m )
+  target_link_libraries(ex_sd_test simgrid pthread )
+  target_link_libraries(sd_test2 simgrid pthread )
+  target_link_libraries(sd_fail simgrid pthread )
+  target_link_libraries(sd_avail simgrid pthread )
+  target_link_libraries(sd_typed_tasks_test simgrid pthread )
+  target_link_libraries(sd_comm_throttling simgrid pthread )
+  target_link_libraries(sd_seq_access simgrid pthread )
+  target_link_libraries(simdag_tracing simgrid pthread )
 
   add_custom_command(TARGET ex_sd_test
     POST_BUILD
@@ -32,16 +31,16 @@ if(NOT WIN32)
     PROPERTIES
     ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/sd_test")
 
-else(NOT WIN32)
+else()
   target_link_libraries(ex_sd_test simgrid)
   target_link_libraries(sd_test2 simgrid)
   target_link_libraries(sd_fail simgrid)
+  target_link_libraries(sd_avail simgrid)
   target_link_libraries(sd_typed_tasks_test simgrid)
   target_link_libraries(sd_comm_throttling simgrid)
   target_link_libraries(sd_seq_access simgrid)
-  target_link_libraries(sd_test_console simgrid)
   target_link_libraries(simdag_tracing simgrid)
-
+  
   add_custom_command(TARGET ex_sd_test
     POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/ex_sd_test.exe ${CMAKE_CURRENT_BINARY_DIR}/sd_test.exe
@@ -51,34 +50,35 @@ else(NOT WIN32)
   set_directory_properties(
     PROPERTIES
     ADDITIONAL_MAKE_CLEAN_FILES "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/sd_test.exe")
-endif(NOT WIN32)
+endif()
 
 set(tesh_files
   ${tesh_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag2.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag2_lua.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_comm_throttling.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_seq_access.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_tracing.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_typed_tasks.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_avail.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_fail.tesh
   PARENT_SCOPE
   )
 set(xml_files
   ${xml_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/2clusters.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/faulty_host.xml
   PARENT_SCOPE
   )
 set(examples_src
   ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/sd_avail.c
   ${CMAKE_CURRENT_SOURCE_DIR}/sd_comm_throttling.c
   ${CMAKE_CURRENT_SOURCE_DIR}/sd_fail.c
   ${CMAKE_CURRENT_SOURCE_DIR}/sd_seq_access.c
   ${CMAKE_CURRENT_SOURCE_DIR}/sd_test.c
   ${CMAKE_CURRENT_SOURCE_DIR}/sd_test2.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/sd_test_console.c
   ${CMAKE_CURRENT_SOURCE_DIR}/sd_typed_tasks_test.c
   ${CMAKE_CURRENT_SOURCE_DIR}/simdag_trace.c
   PARENT_SCOPE
@@ -92,5 +92,7 @@ set(bin_files
 set(txt_files
   ${txt_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/faulty_host.trace
+  ${CMAKE_CURRENT_SOURCE_DIR}/jupiter_power.trace
+  ${CMAKE_CURRENT_SOURCE_DIR}/link1_avail.trace
   PARENT_SCOPE
   )