From 263f137c6dc42876eb1dff3701e3bebd5306ffc2 Mon Sep 17 00:00:00 2001 From: adrien gougeon Date: Thu, 22 Oct 2020 11:10:42 +0200 Subject: [PATCH] added support for test s4u-network-ns3-wifi --- examples/s4u/CMakeLists.txt | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt index c449b48efc..f3d0c50fdb 100644 --- a/examples/s4u/CMakeLists.txt +++ b/examples/s4u/CMakeLists.txt @@ -55,6 +55,10 @@ if(SIMGRID_HAVE_NS3) target_link_libraries(s4u-network-ns3 simgrid) set_target_properties(s4u-network-ns3 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/network-ns3) add_dependencies(tests s4u-network-ns3) + add_executable (s4u-network-ns3-wifi EXCLUDE_FROM_ALL network-ns3-wifi/s4u-network-ns3-wifi.cpp) + target_link_libraries(s4u-network-ns3-wifi simgrid) + set_target_properties(s4u-network-ns3-wifi PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/network-ns3-wifi) + add_dependencies(tests s4u-network-ns3-wifi) endif() # Deal with each example @@ -183,6 +187,11 @@ if(SIMGRID_HAVE_NS3) --setenv bindir=${CMAKE_BINARY_DIR}/examples/s4u --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms ${CMAKE_HOME_DIRECTORY}/examples/s4u/network-ns3/s4u-network-ns3.tesh) + ADD_TESH_FACTORIES(s4u-network-ns3-wifi "thread;ucontext;raw;boost" + --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/s4u + --setenv bindir=${CMAKE_BINARY_DIR}/examples/s4u + --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms + ${CMAKE_HOME_DIRECTORY}/examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.tesh) endif() # Examples not accepting factories ################################## @@ -210,10 +219,12 @@ endif() # Add all extra files to the archive #################################### -set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/s4u-network-ns3.cpp PARENT_SCOPE) +set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/s4u-network-ns3.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3-wifi/s4u-network-ns3-wifi.cpp PARENT_SCOPE) set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/app-pingpong/simix-breakpoint.tesh ${CMAKE_CURRENT_SOURCE_DIR}/mc-bugged1-liveness/s4u-mc-bugged1-liveness-visited.tesh - ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/s4u-network-ns3.tesh PARENT_SCOPE) + ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3/s4u-network-ns3.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/network-ns3-wifi/s4u-network-ns3-wifi.tesh PARENT_SCOPE) set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/actor-create/s4u-actor-create_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/actor-lifetime/s4u-actor-lifetime_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/actor-yield/s4u-actor-yield_d.xml -- 2.20.1