diff --git a/lib/src/CMakeLists.txt b/lib/src/CMakeLists.txt index 2ff8d4d9a..fb5f62463 100644 --- a/lib/src/CMakeLists.txt +++ b/lib/src/CMakeLists.txt @@ -13,6 +13,6 @@ add_subdirectory(phy) add_subdirectory(radio) add_subdirectory(rlc) add_subdirectory(pdcp) +add_subdirectory(gtpu) add_subdirectory(srslog) add_subdirectory(system) -add_subdirectory(upper) diff --git a/lib/src/upper/CMakeLists.txt b/lib/src/gtpu/CMakeLists.txt similarity index 56% rename from lib/src/upper/CMakeLists.txt rename to lib/src/gtpu/CMakeLists.txt index dc8f12d41..a2a9f8ff4 100644 --- a/lib/src/upper/CMakeLists.txt +++ b/lib/src/gtpu/CMakeLists.txt @@ -8,6 +8,6 @@ set(SOURCES gtpu.cc) -add_library(srsran_upper STATIC ${SOURCES}) -target_link_libraries(srsran_upper srsran_common srsran_asn1 ${ATOMIC_LIBS}) -INSTALL(TARGETS srsran_upper DESTINATION ${LIBRARY_DIR}) +add_library(srsran_gtpu STATIC ${SOURCES}) +target_link_libraries(srsran_gtpu srsran_common srsran_asn1 ${ATOMIC_LIBS}) +INSTALL(TARGETS srsran_gtpu DESTINATION ${LIBRARY_DIR}) diff --git a/lib/src/upper/gtpu.cc b/lib/src/gtpu/gtpu.cc similarity index 100% rename from lib/src/upper/gtpu.cc rename to lib/src/gtpu/gtpu.cc diff --git a/srsenb/src/CMakeLists.txt b/srsenb/src/CMakeLists.txt index 6cbf72f82..e5a3c6f03 100644 --- a/srsenb/src/CMakeLists.txt +++ b/srsenb/src/CMakeLists.txt @@ -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) 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(SRSRAN_SOURCES ${SRSRAN_SOURCES} rrc_nr_asn1 ngap_nr_asn1) diff --git a/srsenb/test/ngap/CMakeLists.txt b/srsenb/test/ngap/CMakeLists.txt index 0824d8aac..c64ab8e3f 100644 --- a/srsenb/test/ngap/CMakeLists.txt +++ b/srsenb/test/ngap/CMakeLists.txt @@ -7,7 +7,7 @@ # 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) diff --git a/srsenb/test/s1ap/CMakeLists.txt b/srsenb/test/s1ap/CMakeLists.txt index accc3eb73..6419653ef 100644 --- a/srsenb/test/s1ap/CMakeLists.txt +++ b/srsenb/test/s1ap/CMakeLists.txt @@ -7,6 +7,6 @@ # 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) diff --git a/srsenb/test/upper/CMakeLists.txt b/srsenb/test/upper/CMakeLists.txt index 73cd6eab0..425a97e8a 100644 --- a/srsenb/test/upper/CMakeLists.txt +++ b/srsenb/test/upper/CMakeLists.txt @@ -11,7 +11,7 @@ add_executable(plmn_test plmn_test.cc) target_link_libraries(plmn_test rrc_asn1) 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(gtpu_test gtpu_test) diff --git a/srsepc/src/CMakeLists.txt b/srsepc/src/CMakeLists.txt index 07c15e79f..fac9a9ca5 100644 --- a/srsepc/src/CMakeLists.txt +++ b/srsepc/src/CMakeLists.txt @@ -27,7 +27,8 @@ target_link_libraries( srsepc srsepc_mme srsepc_hss srsepc_sgw s1ap_asn1 - srsran_upper + srsran_gtpu + srsran_asn1 srsran_common srslog ${CMAKE_THREAD_LIBS_INIT} @@ -38,7 +39,8 @@ target_link_libraries( srsepc srsepc_mme add_executable(srsmbms mbms-gw/main.cc ) target_link_libraries(srsmbms srsepc_mbms_gw - srsran_upper + srsran_asn1 + srsran_gtpu srsran_common srslog ${CMAKE_THREAD_LIBS_INIT} diff --git a/srsue/src/CMakeLists.txt b/srsue/src/CMakeLists.txt index 70285a03a..7b37cff78 100644 --- a/srsue/src/CMakeLists.txt +++ b/srsue/src/CMakeLists.txt @@ -22,7 +22,7 @@ endif (RPATH) 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(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(SRSRAN_SOURCES ${SRSRAN_SOURCES} rrc_nr_asn1 ngap_nr_asn1) diff --git a/srsue/src/stack/rrc/test/CMakeLists.txt b/srsue/src/stack/rrc/test/CMakeLists.txt index 0a999b53d..ef592dc2d 100644 --- a/srsue/src/stack/rrc/test/CMakeLists.txt +++ b/srsue/src/stack/rrc/test/CMakeLists.txt @@ -7,11 +7,11 @@ # 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_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_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_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_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) diff --git a/srsue/src/stack/upper/test/CMakeLists.txt b/srsue/src/stack/upper/test/CMakeLists.txt index 54f6b5b83..56dc8c469 100644 --- a/srsue/src/stack/upper/test/CMakeLists.txt +++ b/srsue/src/stack/upper/test/CMakeLists.txt @@ -7,24 +7,24 @@ # 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) if(HAVE_PCSC) 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) 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_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_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) ######################################################################## diff --git a/srsue/src/test/ttcn3/src/CMakeLists.txt b/srsue/src/test/ttcn3/src/CMakeLists.txt index 9daefdbea..1f600b470 100644 --- a/srsue/src/test/ttcn3/src/CMakeLists.txt +++ b/srsue/src/test/ttcn3/src/CMakeLists.txt @@ -13,13 +13,14 @@ set(LINK_LIBRARIES srsue_stack srsue_upper srsue_rrc srsue_rrc_nr - srsran_upper + srsran_gtpu + srsran_pdcp srsran_rlc srsran_common srsran_mac srsran_phy srsran_radio - srsran_upper + srsran_gtpu srsran_pdcp srsue_phy srsue_mac