small fixes, make all compile is same tree

cmake_targets/CMakeLists.txt

@@ -335,10 +335,6 @@ else (CUDA_FOUND)
     )
 endif ()
 
-if(NR)
-  add_definitions(-DNR=1)
-endif()
-
 if (SANITIZE_ADDRESS)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-common")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-common")
@@ -2908,6 +2904,7 @@ add_executable(lte-softmodem
   ${OPENAIR_TARGETS}/ARCH/COMMON/record_player.c
   ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
   ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
+  ${OPENAIR2_DIR}/F1AP/dummy_enb.c
   ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
   ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/multicast_link.c
   ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/socket.c

cmake_targets/build_oai

@@ -66,7 +66,6 @@ UE_DEBUG_TRACE="False"
 UE_TIMING_TRACE="False"
 USRP_REC_PLAY="False"
 BUILD_ECLIPSE=0
-NR="False"
 ITTI_SIM="False"
 RFSIM_NAS="False"
 SANITIZE_ADDRESS="False"
@@ -250,7 +249,6 @@ function main() {
             shift;;
       --gNB)
             gNB=1
-            NR="True"
             echo_info "Will compile gNB"
             shift;;
        -a | --agent)
@@ -262,7 +260,6 @@ function main() {
             shift;;
        --nrUE)
             nrUE=1
-            NR="True"
             rfsimNas=1
             RFSIM_NAS="True"
             echo_info "Will compile NR UE"
@@ -620,7 +617,6 @@ function main() {
     echo "set ( SKIP_SHARED_LIB_FLAG $SKIP_SHARED_LIB_FLAG )"             >> $cmake_file
     echo "set ( ITTI_SIM $ITTI_SIM )"                                     >> $cmake_file
     echo "set ( RFSIM_NAS $RFSIM_NAS )"                                   >> $cmake_file
-    echo "set ( NR \"${NR}\" )"                                           >> $cmake_file
     echo "set ( SANITIZE_ADDRESS $SANITIZE_ADDRESS )"                     >> $cmake_file
     echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)'         >> $cmake_file
     cd  $DIR/$build_dir/build