5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved lib GTPU to its own folder

Browse Source
master
Pedro Alvarez 4 years ago
parent 865298f8d5
commit 1b676aa406
12 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File

2
lib/src/CMakeLists.txt
Unescape Escape View File

@ -13,6 +13,6 @@ add_subdirectory(phy)
add_subdirectory(radio) add_subdirectory(radio)
add_subdirectory(rlc) add_subdirectory(rlc)
add_subdirectory(pdcp) add_subdirectory(pdcp)
add_subdirectory(gtpu)
add_subdirectory(srslog) add_subdirectory(srslog)
add_subdirectory(system) add_subdirectory(system)
add_subdirectory(upper)

6
lib/src/upper/CMakeLists.txt → lib/src/gtpu/CMakeLists.txt
Unescape Escape View File

@ -8,6 +8,6 @@
set(SOURCES gtpu.cc) set(SOURCES gtpu.cc)
add_library(srsran_upper STATIC ${SOURCES}) add_library(srsran_gtpu STATIC ${SOURCES})
target_link_libraries(srsran_upper srsran_common srsran_asn1 ${ATOMIC_LIBS}) target_link_libraries(srsran_gtpu srsran_common srsran_asn1 ${ATOMIC_LIBS})
INSTALL(TARGETS srsran_upper DESTINATION ${LIBRARY_DIR}) INSTALL(TARGETS srsran_gtpu DESTINATION ${LIBRARY_DIR})

0
lib/src/upper/gtpu.cc → lib/src/gtpu/gtpu.cc
Unescape Escape View File

2
srsenb/src/CMakeLists.txt
Unescape Escape View File

@ -27,7 +27,7 @@ target_link_libraries(enb_cfg_parser ${LIBCONFIGPP_LIBRARIES})
add_executable(srsenb main.cc enb.cc metrics_stdout.cc metrics_csv.cc metrics_json.cc) add_executable(srsenb main.cc enb.cc metrics_stdout.cc metrics_csv.cc metrics_json.cc)
set(SRSENB_SOURCES srsenb_phy srsenb_stack srsenb_common srsenb_s1ap srsenb_upper srsenb_mac srsenb_rrc srslog system) set(SRSENB_SOURCES srsenb_phy srsenb_stack srsenb_common srsenb_s1ap srsenb_upper srsenb_mac srsenb_rrc srslog system)
set(SRSRAN_SOURCES srsran_common srsran_mac srsran_phy srsran_upper srsran_rlc srsran_pdcp srsran_radio rrc_asn1 s1ap_asn1 enb_cfg_parser srslog system) set(SRSRAN_SOURCES srsran_common srsran_mac srsran_phy srsran_gtpu srsran_rlc srsran_pdcp srsran_radio rrc_asn1 s1ap_asn1 enb_cfg_parser srslog system)
set(SRSENB_SOURCES ${SRSENB_SOURCES} srsgnb_phy srsgnb_stack srsgnb_ngap srsgnb_upper srsgnb_mac srsgnb_rrc) set(SRSENB_SOURCES ${SRSENB_SOURCES} srsgnb_phy srsgnb_stack srsgnb_ngap srsgnb_upper srsgnb_mac srsgnb_rrc)
set(SRSRAN_SOURCES ${SRSRAN_SOURCES} rrc_nr_asn1 ngap_nr_asn1) set(SRSRAN_SOURCES ${SRSRAN_SOURCES} rrc_nr_asn1 ngap_nr_asn1)

2
srsenb/test/ngap/CMakeLists.txt
Unescape Escape View File

@ -7,7 +7,7 @@
# #
add_executable(ngap_test ngap_test.cc) add_executable(ngap_test ngap_test.cc)
target_link_libraries(ngap_test srsran_common ngap_nr_asn1 srsenb_upper srsran_upper ngap_nr_asn1 srsgnb_upper srsgnb_ngap ${SCTP_LIBRARIES}) target_link_libraries(ngap_test srsran_common ngap_nr_asn1 srsenb_upper srsran_gtpu ngap_nr_asn1 srsgnb_upper srsgnb_ngap ${SCTP_LIBRARIES})
add_test(ngap_test ngap_test) add_test(ngap_test ngap_test)

2
srsenb/test/s1ap/CMakeLists.txt
Unescape Escape View File

@ -7,6 +7,6 @@
# #
add_executable(s1ap_test s1ap_test.cc) add_executable(s1ap_test s1ap_test.cc)
target_link_libraries(s1ap_test srsran_common s1ap_asn1 srsenb_s1ap srsenb_upper srsran_upper s1ap_asn1 ${SCTP_LIBRARIES}) target_link_libraries(s1ap_test srsran_common s1ap_asn1 srsenb_s1ap srsenb_upper s1ap_asn1 ${SCTP_LIBRARIES})
add_test(s1ap_test s1ap_test) add_test(s1ap_test s1ap_test)

2
srsenb/test/upper/CMakeLists.txt
Unescape Escape View File

@ -11,7 +11,7 @@ add_executable(plmn_test plmn_test.cc)
target_link_libraries(plmn_test rrc_asn1) target_link_libraries(plmn_test rrc_asn1)
add_executable(gtpu_test gtpu_test.cc) add_executable(gtpu_test gtpu_test.cc)
target_link_libraries(gtpu_test srsran_common s1ap_asn1 srsenb_upper srsran_upper ${SCTP_LIBRARIES}) target_link_libraries(gtpu_test srsran_common s1ap_asn1 srsenb_upper srsran_gtpu ${SCTP_LIBRARIES})
add_test(plmn_test plmn_test) add_test(plmn_test plmn_test)
add_test(gtpu_test gtpu_test) add_test(gtpu_test gtpu_test)

6
srsepc/src/CMakeLists.txt
Unescape Escape View File

@ -27,7 +27,8 @@ target_link_libraries( srsepc srsepc_mme
srsepc_hss srsepc_hss
srsepc_sgw srsepc_sgw
s1ap_asn1 s1ap_asn1
srsran_upper srsran_gtpu
srsran_asn1
srsran_common srsran_common
srslog srslog
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
@ -38,7 +39,8 @@ target_link_libraries( srsepc srsepc_mme
add_executable(srsmbms mbms-gw/main.cc ) add_executable(srsmbms mbms-gw/main.cc )
target_link_libraries(srsmbms srsepc_mbms_gw target_link_libraries(srsmbms srsepc_mbms_gw
srsran_upper srsran_asn1
srsran_gtpu
srsran_common srsran_common
srslog srslog
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}

2
srsue/src/CMakeLists.txt
Unescape Escape View File

@ -22,7 +22,7 @@ endif (RPATH)
add_executable(srsue main.cc ue.cc metrics_stdout.cc metrics_csv.cc metrics_json.cc) add_executable(srsue main.cc ue.cc metrics_stdout.cc metrics_csv.cc metrics_json.cc)
set(SRSUE_SOURCES srsue_phy srsue_stack srsue_upper srsue_mac srsue_rrc srslog system) set(SRSUE_SOURCES srsue_phy srsue_stack srsue_upper srsue_mac srsue_rrc srslog system)
set(SRSRAN_SOURCES srsran_common srsran_mac srsran_phy srsran_radio srsran_upper srsran_rlc srsran_pdcp rrc_asn1 srslog system) set(SRSRAN_SOURCES srsran_common srsran_mac srsran_phy srsran_radio srsran_gtpu srsran_rlc srsran_pdcp rrc_asn1 srslog system)
set(SRSUE_SOURCES ${SRSUE_SOURCES} srsue_nr_stack srsue_rrc_nr srsue_mac_nr) set(SRSUE_SOURCES ${SRSUE_SOURCES} srsue_nr_stack srsue_rrc_nr srsue_mac_nr)
set(SRSRAN_SOURCES ${SRSRAN_SOURCES} rrc_nr_asn1 ngap_nr_asn1) set(SRSRAN_SOURCES ${SRSRAN_SOURCES} rrc_nr_asn1 ngap_nr_asn1)

8
srsue/src/stack/rrc/test/CMakeLists.txt
Unescape Escape View File

@ -7,11 +7,11 @@
# #
add_executable(rrc_reconfig_test rrc_reconfig_test.cc) add_executable(rrc_reconfig_test rrc_reconfig_test.cc)
target_link_libraries(rrc_reconfig_test srsue_upper srsran_upper srsran_phy rrc_asn1) target_link_libraries(rrc_reconfig_test srsue_upper srsran_phy srsran_asn1 rrc_asn1 srslog)
add_test(rrc_reconfig_test rrc_reconfig_test) add_test(rrc_reconfig_test rrc_reconfig_test)
add_executable(rrc_meas_test rrc_meas_test.cc) add_executable(rrc_meas_test rrc_meas_test.cc)
target_link_libraries(rrc_meas_test srsue_rrc srsue_upper srsran_upper srsran_pdcp srsran_phy rrc_asn1 rrc_nr_asn1) target_link_libraries(rrc_meas_test srsue_rrc srsue_upper srsran_pdcp srsran_phy rrc_asn1 rrc_nr_asn1)
add_test(rrc_meas_test rrc_meas_test) add_test(rrc_meas_test rrc_meas_test)
add_executable(rrc_phy_ctrl_test rrc_phy_ctrl_test.cc) add_executable(rrc_phy_ctrl_test rrc_phy_ctrl_test.cc)
@ -19,11 +19,11 @@ target_link_libraries(rrc_phy_ctrl_test srsran_common srsue_rrc ${ATOMIC_LIBS})
add_test(rrc_phy_ctrl_test rrc_phy_ctrl_test) add_test(rrc_phy_ctrl_test rrc_phy_ctrl_test)
add_executable(rrc_cell_test rrc_cell_test.cc) add_executable(rrc_cell_test rrc_cell_test.cc)
target_link_libraries(rrc_cell_test srsue_rrc srsue_upper srsran_upper srsran_phy rrc_asn1 rrc_nr_asn1) target_link_libraries(rrc_cell_test srsue_rrc srsue_upper srsran_pdcp srsran_phy rrc_asn1 rrc_nr_asn1)
add_test(rrc_cell_test rrc_cell_test) add_test(rrc_cell_test rrc_cell_test)
add_executable(ue_rrc_nr_test ue_rrc_nr_test.cc) add_executable(ue_rrc_nr_test ue_rrc_nr_test.cc)
target_link_libraries(ue_rrc_nr_test srsue_rrc_nr srsue_upper srsran_common srsran_upper srsran_phy rrc_asn1 rrc_nr_asn1) target_link_libraries(ue_rrc_nr_test srsue_rrc_nr srsue_upper srsran_common srsran_pdcp srsran_phy rrc_asn1 rrc_nr_asn1)
######################################################################## ########################################################################
# Option to run command after build (useful for remote builds) # Option to run command after build (useful for remote builds)

10
srsue/src/stack/upper/test/CMakeLists.txt
Unescape Escape View File

@ -7,24 +7,24 @@
# #
add_executable(usim_test usim_test.cc) add_executable(usim_test usim_test.cc)
target_link_libraries(usim_test srsue_upper srsran_upper srsran_phy rrc_asn1) target_link_libraries(usim_test srsue_upper srsran_phy rrc_asn1 srslog)
add_test(usim_test usim_test) add_test(usim_test usim_test)
if(HAVE_PCSC) if(HAVE_PCSC)
add_executable(pcsc_usim_test pcsc_usim_test.cc) add_executable(pcsc_usim_test pcsc_usim_test.cc)
target_link_libraries(pcsc_usim_test srsue_upper srsran_upper srsran_phy) target_link_libraries(pcsc_usim_test srsue_upper srsran_phy srsran_common srslog)
endif(HAVE_PCSC) endif(HAVE_PCSC)
add_executable(nas_test nas_test.cc) add_executable(nas_test nas_test.cc)
target_link_libraries(nas_test srsue_upper srsran_upper srsran_phy rrc_asn1) target_link_libraries(nas_test srsue_upper srsran_common srsran_phy rrc_asn1 srsran_asn1)
add_test(nas_test nas_test) add_test(nas_test nas_test)
add_executable(gw_test gw_test.cc) add_executable(gw_test gw_test.cc)
target_link_libraries(gw_test srsue_upper srsran_upper srsran_phy) target_link_libraries(gw_test srsue_upper srsran_common srsran_phy)
add_test(gw_test gw_test) add_test(gw_test gw_test)
add_executable(tft_test tft_test.cc) add_executable(tft_test tft_test.cc)
target_link_libraries(tft_test srsue_upper srsran_upper srsran_phy) target_link_libraries(tft_test srsue_upper srsran_common srsran_phy)
add_test(tft_test tft_test) add_test(tft_test tft_test)
######################################################################## ########################################################################

5
srsue/src/test/ttcn3/src/CMakeLists.txt
Unescape Escape View File

@ -13,13 +13,14 @@ set(LINK_LIBRARIES srsue_stack
srsue_upper srsue_upper
srsue_rrc srsue_rrc
srsue_rrc_nr srsue_rrc_nr
srsran_upper srsran_gtpu
srsran_pdcp
srsran_rlc srsran_rlc
srsran_common srsran_common
srsran_mac srsran_mac
srsran_phy srsran_phy
srsran_radio srsran_radio
srsran_upper srsran_gtpu
srsran_pdcp srsran_pdcp
srsue_phy srsue_phy
srsue_mac srsue_mac

Write Preview
Loading…
Cancel
Save