merge last develop

cmake_targets/build_oai

@@ -53,16 +53,10 @@ BUILD_COVERITY_SCAN=0
 DISABLE_HARDWARE_DEPENDENCY="False"
 CMAKE_BUILD_TYPE="RelWithDebInfo"
 CMAKE_CMD="$CMAKE"
+MAKE_CMD=make
 BUILD_ECLIPSE=0
 NR="False"
-OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope ldpc_cuda ldpc_t1 oai_iqplayer"
-ulfiusdep=$(basename ./`find /usr/lib* -name libulfius.so`)
-jssondep=$(basename ./`find /usr/lib* -name libjansson.so`)
-if [ "$ulfiusdep" == "libulfius.so" -a "$jssondep" == "libjansson.so" ] ; then
-  OPTIONAL_LIBRARIES+=" websrv"
-else
-  echo_warning "  websrv optional build not included in build-lib option  as dependencies requirements not met "
-fi
+OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope nrqtscope ldpc_cuda ldpc_t1 websrv oai_iqplayer"
 RU=0
 CMAKE_C_FLAGS=()
 CMAKE_CXX_FLAGS=()
@@ -99,8 +93,6 @@ Options:
    enable cmake debugging messages
 --eNB
   Makes the LTE softmodem
---eNBocp
-  Makes the OCP LTE softmodem
 --gNB
   Makes the NR softmodem
 --RU
@@ -254,10 +246,6 @@ function main() {
             eNB=1
             echo_info "Will compile eNB"
             shift;;
-       --eNBocp)
-            eNBocp=1
-            echo_info "Will compile OCP eNB"
-            shift;;
       --gNB)
             gNB=1
             echo_info "Will compile gNB"
@@ -457,7 +445,7 @@ function main() {
   ########################################################
   # to be discussed
   
-  if [ "$eNB" = "1" -o "$eNBocp" = "1" -o "$gNB" = "1" ] ; then
+  if [ "$eNB" = "1" -o "$gNB" = "1" ] ; then
       if [ "$HW" = "None" -a  "$TP" = "None" ] ; then
 	      echo_info "No local radio head and no transport protocol selected"
       fi
@@ -532,9 +520,6 @@ function main() {
   if [ "$eNB" = "1" ] ; then
       execlist="$execlist lte-softmodem"
   fi
-  if [ "$eNBocp" = "1" ] ; then
-      execlist="$execlist ocp-enb"
-  fi
   if [ "$gNB" = "1" ] ; then
       execlist="$execlist nr-softmodem nr-cuup"
   fi
@@ -660,7 +645,7 @@ function main() {
   ####################################################
   # Build RF device and transport protocol libraries #
   ####################################################
-  if [ "$eNB" = "1" -o "$eNBocp" = "1" -o "$UE" = "1" -o "$gNB" = "1" -o "$RU" = "1"  -o "$nrUE" = "1" ] ; then
+  if [ "$eNB" = "1" -o "$UE" = "1" -o "$gNB" = "1" -o "$RU" = "1"  -o "$nrUE" = "1" ] ; then
 
       # build RF device libraries
       if [ "$HW" != "None" ] ; then

cmake_targets/tools/build_helper

@@ -551,6 +551,7 @@ check_install_additional_tools (){
     PACKAGE_LIST="\
 	doxygen \
 	libpthread-stubs0-dev \
+	libqt5charts5-dev \
 	tshark \
 	uml-utilities \
         iperf3 \