From 7ac1fa0456cc8bbe1401ed3fd94b845a0a3698f3 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 18 Feb 2022 11:45:25 +0100 Subject: [PATCH] Try again to enable ns3 for coverage and sonar [ci-skip]. --- CMakeLists.txt | 2 +- tools/jenkins/Coverage.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d51656deb..457be86f4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -409,7 +409,7 @@ if(enable_java AND NOT enable_msg) endif() if (enable_model-checking AND enable_ns3) - message(FATAL_ERROR "Cannot activate both model-checking and ns-3 bindings: ns-3 pulls too much dependencies for the MC to work") + message(WARNING "Activating both model-checking and ns-3 bindings is considered experimental.") endif() if(enable_smpi) diff --git a/tools/jenkins/Coverage.sh b/tools/jenkins/Coverage.sh index 43ac166256..446df9a533 100755 --- a/tools/jenkins/Coverage.sh +++ b/tools/jenkins/Coverage.sh @@ -69,6 +69,7 @@ ctest -D ExperimentalStart || true cmake -Denable_documentation=OFF \ -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON \ -Denable_mallocators=ON \ + -Denable_ns3=ON \ -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_model-checking=ON \ -Denable_smpi_papi=ON \ -Denable_memcheck=OFF -Denable_memcheck_xml=OFF -Denable_smpi_ISP_testsuite=ON \ -- 2.20.1