From 772752c551d4a98997eca9ec0991a7987c95cd36 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 26 Feb 2021 10:16:01 +0100 Subject: [PATCH] Need at least ns-3.28. --- CMakeLists.txt | 3 +++ tools/jenkins/build.sh | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dae34bc442..66878ed333 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -237,6 +237,9 @@ set(SIMGRID_HAVE_NS3 0) if(enable_ns3) include(FindNS3) if (SIMGRID_HAVE_NS3) + if (NS3_VERSION VERSION_LESS "3.28") + message(FATAL_ERROR "SimGrid needs at least ns-3.28. Please ugrade or disable that cmake option") + endif() set(SIMGRID_HAVE_NS3 1) foreach(lib core csma point-to-point internet network applications wifi) set(SIMGRID_DEP "${SIMGRID_DEP} -lns${NS3_VERSION}-${lib}${NS3_SUFFIX}") diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh index e490083396..b44245a69a 100755 --- a/tools/jenkins/build.sh +++ b/tools/jenkins/build.sh @@ -145,7 +145,12 @@ mkdir "$WORKSPACE"/build cd "$WORKSPACE"/build have_NS3="no" -if [ "$os" = "Debian" ] || [ "$os" = "Ubuntu" ] || [ "$os" = "NixOS" ] ; then +if [ "$os" = "Debian" ] || [ "$os" = "Ubuntu" ] ; then + if dpkg --compare-versions "$(dpkg-query -f '${Version}' -W libns3-dev)" ge 3.28; then + have_NS3="yes" + fi +fi +if [ "$os" = "NixOS" ] ; then have_NS3="yes" fi echo "XX have_NS3: ${have_NS3}" -- 2.20.1