Merge remote-tracking branch 'origin/fix-simu' into integration_2023_w28

cmake_targets/build_oai

@@ -269,11 +269,16 @@ function main() {
             shift;;
        -w | --hardware)
             case "$2" in
-                "USRP" | "BLADERF" | "LMSSDR" | "IRIS" | "SIMU")
+                "USRP" | "BLADERF" | "LMSSDR" | "IRIS")
                     HW="OAI_"$2
                     TARGET_LIST="$TARGET_LIST oai_${2,,}devif" # ,, makes lowercase
                     CMAKE_CMD="$CMAKE_CMD -DOAI_$2=ON"
                     ;;
+                "SIMU")
+                    HW="OAI_"$2
+                    TARGET_LIST="$TARGET_LIST rfsimulator"
+                    CMAKE_CMD="$CMAKE_CMD -DOAI_$2=ON"
+                    ;;
                 "AW2SORI")
                     HW="OAI_"$2
                     TARGET_LIST="$TARGET_LIST aw2sori_transpro"

radio/rfsimulator/CMakeLists.txt

@@ -4,7 +4,6 @@ add_library(rfsimulator MODULE
             ../../openair1/PHY/TOOLS/signal_energy.c
 )
 target_link_libraries(rfsimulator PRIVATE SIMU)
-target_link_libraries(rfsimulator PRIVATE asn1_nr_rrc asn1_lte_rrc)
 set_target_properties(rfsimulator PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
 add_executable(replay_node stored_node.c)