convert and simplify network-ns3 example

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

diff --git a/examples/deprecated/msg/CMakeLists.txt b/examples/deprecated/msg/CMakeLists.txt
index cbbc1d5..51ff5fd 100644 (file)
--- a/examples/deprecated/msg/CMakeLists.txt
+++ b/examples/deprecated/msg/CMakeLists.txt
@@ -14,13 +14,6 @@ foreach(x app-masterworker cloud-masterworker
   set(tesh_files   ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
 endforeach()
 
-if(SIMGRID_HAVE_NS3 AND enable_msg)
-  add_executable       (network-ns3 EXCLUDE_FROM_ALL network-ns3/network-ns3.c)
-  target_link_libraries(network-ns3 simgrid)
-  set_target_properties(network-ns3  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/network-ns3)
-  add_dependencies(tests network-ns3)    
-endif()
-
 if(enable_msg)
   add_executable       (dht-kademlia EXCLUDE_FROM_ALL dht-kademlia/dht-kademlia.c dht-kademlia/node.c dht-kademlia/routing_table.c dht-kademlia/task.c dht-kademlia/answer.c)
   target_link_libraries(dht-kademlia simgrid)
@@ -38,21 +31,14 @@ endforeach()
 set(txt_files    ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/README.doc          PARENT_SCOPE)
 set(bin_files    ${bin_files}     ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/generate.py
                                   ${CMAKE_CURRENT_SOURCE_DIR}/dht-pastry/generate.py                       PARENT_SCOPE)
-set(examples_src ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/common.h
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/network-ns3.c                    PARENT_SCOPE)
+set(examples_src ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/common.h                        PARENT_SCOPE)
 set(tesh_files   ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/dht-kademlia/dht-kademlia.tesh
                                   ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/app-masterworker-multicore.tesh
                                   ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/app-masterworker-vivaldi.tesh
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/network-ns3.tesh                 PARENT_SCOPE)
+                                  PARENT_SCOPE)
 set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/app-masterworker-multicore_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/app-masterworker-vivaldi_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/3hosts_2links_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/3links-timer_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/3links_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/crosstraffic_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/dogbone_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/onelink_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/one_cluster_d.xml        PARENT_SCOPE)
+                                  PARENT_SCOPE)
 
 if(enable_msg)
   foreach(x app-masterworker cloud-masterworker
@@ -97,11 +83,4 @@ if(enable_msg)
                                                  --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms
                                                  ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/app-masterworker/app-masterworker-vivaldi.tesh)
 
-  if(SIMGRID_HAVE_NS3)
-    ADD_TESH_FACTORIES(msg-network-ns3 "thread;ucontext;raw;boost"
-                                        --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg
-                                        --setenv bindir=${CMAKE_BINARY_DIR}/examples/deprecated/msg
-                                        --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms
-                                        ${CMAKE_HOME_DIRECTORY}/examples/deprecated/msg/network-ns3/network-ns3.tesh)
-  endif()
 endif(enable_msg)
\ No newline at end of file