From c8b16a642a34db21b3ac9d71cab439eb6bd27af4 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 5 Apr 2023 21:40:32 +0200 Subject: [PATCH] Fix make distcheck, stupid bummer --- MANIFEST.in | 3 ++- examples/cpp/CMakeLists.txt | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index ce4e41580c..85f70a9743 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -345,8 +345,9 @@ include examples/cpp/network-ns3/crosstraffic_d.xml include examples/cpp/network-ns3/dogbone_d.xml include examples/cpp/network-ns3/one_cluster_d.xml include examples/cpp/network-ns3/onelink_d.xml +include examples/cpp/network-ns3/s4u-network-ns3-notime.tesh +include examples/cpp/network-ns3/s4u-network-ns3-timed.tesh include examples/cpp/network-ns3/s4u-network-ns3.cpp -include examples/cpp/network-ns3/s4u-network-ns3.tesh include examples/cpp/network-wifi/s4u-network-wifi.cpp include examples/cpp/network-wifi/s4u-network-wifi.tesh include examples/cpp/platform-comm-serialize/s4u-platform-comm-serialize.cpp diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt index add0eb1da6..a43cfdab14 100644 --- a/examples/cpp/CMakeLists.txt +++ b/examples/cpp/CMakeLists.txt @@ -126,6 +126,10 @@ if(SIMGRID_HAVE_NS3) endif() else() + # Even if ns3 is not found, we need to override the teshfile name and make sure that everything gets included in the archive + set(_network-ns3_teshfile ${CMAKE_HOME_DIRECTORY}/examples/cpp/network-ns3/s4u-network-ns3-notime.tesh) + set(tesh_files ${tesh_files} ${CMAKE_HOME_DIRECTORY}/examples/cpp/network-ns3/s4u-network-ns3-timed.tesh) + foreach (example network-ns3 network-ns3-wifi) set(_${example}_disable 1) endforeach() -- 2.20.1