move nr_ru_procedures to SCHED_NR_SRC to prevent including unnecessary SCHED_RU_LIB
This commit is contained in:
+5
-4
@@ -709,6 +709,7 @@ target_link_libraries(SCHED_LIB PRIVATE asn1_lte_rrc_hdrs)
|
|||||||
set(SCHED_NR_SRC
|
set(SCHED_NR_SRC
|
||||||
${OPENAIR1_DIR}/SCHED_NR/phy_procedures_nr_gNB.c
|
${OPENAIR1_DIR}/SCHED_NR/phy_procedures_nr_gNB.c
|
||||||
${OPENAIR1_DIR}/SCHED_NR/nr_prach_procedures.c
|
${OPENAIR1_DIR}/SCHED_NR/nr_prach_procedures.c
|
||||||
|
${OPENAIR1_DIR}/SCHED_NR/nr_ru_procedures.c
|
||||||
${OPENAIR1_DIR}/SCHED_NR/phy_frame_config_nr.c
|
${OPENAIR1_DIR}/SCHED_NR/phy_frame_config_nr.c
|
||||||
)
|
)
|
||||||
add_library(SCHED_NR_LIB ${SCHED_NR_SRC})
|
add_library(SCHED_NR_LIB ${SCHED_NR_SRC})
|
||||||
@@ -716,7 +717,6 @@ target_link_libraries(SCHED_NR_LIB PRIVATE asn1_nr_rrc_hdrs UTIL)
|
|||||||
|
|
||||||
set(SCHED_SRC_RU
|
set(SCHED_SRC_RU
|
||||||
${OPENAIR1_DIR}/SCHED/ru_procedures.c
|
${OPENAIR1_DIR}/SCHED/ru_procedures.c
|
||||||
${OPENAIR1_DIR}/SCHED_NR/nr_ru_procedures.c
|
|
||||||
${OPENAIR1_DIR}/SCHED/prach_procedures.c
|
${OPENAIR1_DIR}/SCHED/prach_procedures.c
|
||||||
)
|
)
|
||||||
add_library(SCHED_RU_LIB ${SCHED_SRC_RU})
|
add_library(SCHED_RU_LIB ${SCHED_SRC_RU})
|
||||||
@@ -1818,11 +1818,12 @@ add_executable(nr-oru
|
|||||||
${OPENAIR_DIR}/openair1/PHY/INIT/nr_parms.c
|
${OPENAIR_DIR}/openair1/PHY/INIT/nr_parms.c
|
||||||
${OPENAIR_DIR}/openair1/SCHED_NR/phy_frame_config_nr.c
|
${OPENAIR_DIR}/openair1/SCHED_NR/phy_frame_config_nr.c
|
||||||
${OPENAIR_DIR}/openair1/SCHED_NR/nr_prach_procedures.c
|
${OPENAIR_DIR}/openair1/SCHED_NR/nr_prach_procedures.c
|
||||||
|
${OPENAIR_DIR}/openair1/SCHED_NR/nr_ru_procedures.c
|
||||||
${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
|
${OPENAIR_DIR}/openair1/SCHED/phy_procedures_lte_common.c
|
||||||
${OPENAIR_DIR}/executables/main_nr_ru.c
|
${OPENAIR_DIR}/executables/main_nr_ru.c
|
||||||
)
|
)
|
||||||
target_link_libraries(nr-oru PRIVATE
|
target_link_libraries(nr-oru PRIVATE
|
||||||
UTIL SCHED_RU_LIB NR_PHY_RU PHY_NR shlib_loader z dl
|
UTIL NR_PHY_RU PHY_NR shlib_loader z dl
|
||||||
radio_common softmodem_common)
|
radio_common softmodem_common)
|
||||||
target_link_libraries(nr-oru PRIVATE pthread m CONFIG_LIB rt ${T_LIB} utils
|
target_link_libraries(nr-oru PRIVATE pthread m CONFIG_LIB rt ${T_LIB} utils
|
||||||
barrier actor)
|
barrier actor)
|
||||||
@@ -1846,7 +1847,7 @@ add_executable(nr-softmodem
|
|||||||
|
|
||||||
target_link_libraries(nr-softmodem PRIVATE
|
target_link_libraries(nr-softmodem PRIVATE
|
||||||
-Wl,--start-group
|
-Wl,--start-group
|
||||||
UTIL SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_NR_COMMON NR_PHY_RU GTPV1U SECURITY
|
UTIL SCTP_CLIENT SCHED_LIB SCHED_NR_LIB PHY_NR PHY PHY_NR_COMMON NR_PHY_RU GTPV1U SECURITY
|
||||||
ITTI ${NAS_UE_LIB} lte_rrc nr_rrc
|
ITTI ${NAS_UE_LIB} lte_rrc nr_rrc
|
||||||
ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU
|
ngap s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU
|
||||||
x2ap f1ap m2ap m3ap e1ap radio_common
|
x2ap f1ap m2ap m3ap e1ap radio_common
|
||||||
@@ -1915,7 +1916,7 @@ add_executable(nr-uesoftmodem
|
|||||||
|
|
||||||
target_link_libraries(nr-uesoftmodem PRIVATE
|
target_link_libraries(nr-uesoftmodem PRIVATE
|
||||||
-Wl,--start-group
|
-Wl,--start-group
|
||||||
nr_rrc SECURITY UTIL SCHED_RU_LIB SCHED_NR_UE_LIB
|
nr_rrc SECURITY UTIL SCHED_NR_UE_LIB
|
||||||
PHY_NR_COMMON PHY_NR_UE NR_L2_UE MAC_NR_COMMON NFAPI_LIB
|
PHY_NR_COMMON PHY_NR_UE NR_L2_UE MAC_NR_COMMON NFAPI_LIB
|
||||||
ITTI SIMU radio_common
|
ITTI SIMU radio_common
|
||||||
time_management softmodem_common
|
time_management softmodem_common
|
||||||
|
|||||||
Reference in New Issue
Block a user