resolve cmakelists conflict

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

diff --git a/examples/msg/masterslave/CMakeLists.txt b/examples/msg/masterslave/CMakeLists.txt
index b062bf8..91d61fb 100644 (file)
--- a/examples/msg/masterslave/CMakeLists.txt
+++ b/examples/msg/masterslave/CMakeLists.txt
@@ -6,7 +6,6 @@ add_executable(masterslave_failure "masterslave_failure.c")
 add_executable(masterslave_forwarder "masterslave_forwarder.c")
 add_executable(masterslave_mailbox "masterslave_mailbox.c")
 add_executable(masterslave_bypass "masterslave_bypass.c")
-add_executable(masterslave_console "masterslave_console.c")
 add_executable(masterslave_cluster "masterslave_cluster.c")
 add_executable(masterslave_kill "masterslave_kill.c")
 add_executable(masterslave_arg "masterslave_arg.c")
@@ -19,21 +18,19 @@ if(WIN32)
   target_link_libraries(masterslave_failure simgrid )
   target_link_libraries(masterslave_mailbox simgrid )
   target_link_libraries(masterslave_bypass simgrid )
-  target_link_libraries(masterslave_console simgrid )
   target_link_libraries(masterslave_kill simgrid )
   target_link_libraries(masterslave_arg simgrid )
   target_link_libraries(masterslave_platfgen simgrid )
   target_link_libraries(masterslave_failure_platfgen simgrid )
 else()
-  target_link_libraries(masterslave_forwarder simgrid m )
-  target_link_libraries(masterslave_failure simgrid m )
-  target_link_libraries(masterslave_mailbox simgrid m )
-  target_link_libraries(masterslave_bypass simgrid m )
-  target_link_libraries(masterslave_console simgrid m )
-  target_link_libraries(masterslave_kill simgrid m )
-  target_link_libraries(masterslave_arg simgrid m )
-  target_link_libraries(masterslave_platfgen simgrid m )
-  target_link_libraries(masterslave_failure_platfgen simgrid m )
+  target_link_libraries(masterslave_forwarder simgrid )
+  target_link_libraries(masterslave_failure simgrid )
+  target_link_libraries(masterslave_mailbox simgrid )
+  target_link_libraries(masterslave_bypass simgrid )
+  target_link_libraries(masterslave_kill simgrid )
+  target_link_libraries(masterslave_arg simgrid )
+  target_link_libraries(masterslave_platfgen simgrid )
+  target_link_libraries(masterslave_failure_platfgen simgrid )
 endif()
 target_link_libraries(masterslave_cluster simgrid)
 
@@ -47,7 +44,6 @@ set(tesh_files
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_crosstraffic.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_forwarder.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_multicore.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_console.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_failure_crosstraffic.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_kill.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave.tesh
@@ -74,7 +70,6 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_arg.c
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_bypass.c
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_cluster.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_console.c
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_failure.c
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_forwarder.c
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_kill.c
@@ -85,10 +80,10 @@ set(examples_src
   )
 set(bin_files
   ${bin_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform_script.lua
   PARENT_SCOPE
   )
 set(txt_files
   ${txt_files}
   PARENT_SCOPE
   )
+