merge ns3 cmake ino msg cmake

diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt
index e2cfd02..3ec5736 100644 (file)
--- a/examples/msg/CMakeLists.txt
+++ b/examples/msg/CMakeLists.txt
@@ -9,14 +9,21 @@ foreach(x actions-mpi actions-storage async-wait async-waitall async-waitany dht
   set(tesh_files   ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
 endforeach()
 
+if(HAVE_NS3)
+  add_executable       (ns3 ns3/ns3.c)
+  target_link_libraries(ns3 simgrid)
+  set_target_properties(ns3  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ns3)
+endif()
+
 set(txt_files    ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/README
                                   ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi.txt
                                   ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi_split_p0.txt
                                   ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi_split_p1.txt
                                   ${CMAKE_CURRENT_SOURCE_DIR}/actions-storage/actions-storage.txt          PARENT_SCOPE)
 set(bin_files    ${bin_files}     ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/generate.py                        PARENT_SCOPE)
-set(examples_src ${examples_src}                                                                           PARENT_SCOPE)
-set(tesh_files   ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/dht-chord_crosstraffic.tesh        PARENT_SCOPE)
+set(examples_src ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/ns3.c                                    PARENT_SCOPE)
+set(tesh_files   ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/dht-chord/dht-chord_crosstraffic.tesh
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/ns3.tesh                                 PARENT_SCOPE)
 set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/actions-mpi_split_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/actions-storage/actions-storage_d.xml
@@ -31,6 +38,14 @@ set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/actions-mpi/action
                                   ${CMAKE_CURRENT_SOURCE_DIR}/dht-pastry/pastry10.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/energy-onoff/platform_onoff.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/io-remote/io-remote_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/3hosts_2links_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/3links-timer_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/3links_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/crosstraffic_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/dogbone_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/onelink_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/one_cluster_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/ns3/two_clusters_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/priority/priority_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/properties/properties_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv/sendrecv_d.xml
@@ -64,6 +79,10 @@ ADD_TESH_FACTORIES(msg-set-maestro                     "thread" --setenv srcdir=
 
 ADD_TESH(msg-pmm  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/pmm/pmm.tesh)
 
+if(HAVE_NS3)
+  ADD_TESH_FACTORIES(msg-ns3 "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh)
+endif()
+
 # These one are not usable:
 # ADD_TESH_FACTORIES(msg-exception "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/exception/exception.tesh)
 # ADD_TESH_FACTORIES(msg-dht-pastry                    "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/dht-pastry --cd ${CMAKE_BINARY_DIR}/examples/msg/dht-pastry dht-pastry.tesh)

diff --git a/examples/msg/ns3/CMakeLists.txt b/examples/msg/ns3/CMakeLists.txt
deleted file mode 100644 (file)
index 630f4e3..0000000
--- a/examples/msg/ns3/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-if(HAVE_NS3)
-  add_executable       (ns3 ns3.c)
-  target_link_libraries(ns3 simgrid)
-
-  ADD_TESH_FACTORIES(msg-ns3 "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh)
-endif()
-
-set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/ns3.c                   PARENT_SCOPE)
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/ns3.tesh                PARENT_SCOPE)
-set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/3hosts_2links_d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/3links-timer_d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/3links_d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/crosstraffic_d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/dogbone_d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/onelink_d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_d.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/two_clusters_d.xml      PARENT_SCOPE)

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 0c54171..3be060c 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -955,7 +955,6 @@ set(CMAKEFILES_TXT
     examples/msg/dht-kademlia/CMakeLists.txt
     examples/msg/masterslave/CMakeLists.txt
     examples/msg/mc/CMakeLists.txt
-    examples/msg/ns3/CMakeLists.txt
     examples/msg/tracing/CMakeLists.txt
   examples/s4u/CMakeLists.txt
   examples/simdag/CMakeLists.txt