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

compile: fix compilation on 32bit systems that require -latomic

Browse Source
master
Andre Puschmann 4 years ago
parent 5d238a6d80
commit 107f6334dd
7 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File

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

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

4
lib/test/common/CMakeLists.txt
Unescape Escape View File

@ -54,7 +54,7 @@ target_link_libraries(queue_test srsran_common ${CMAKE_THREAD_LIBS_INIT})
add_test(queue_test queue_test) add_test(queue_test queue_test)
add_executable(timer_test timer_test.cc) add_executable(timer_test timer_test.cc)
target_link_libraries(timer_test srsran_common) target_link_libraries(timer_test srsran_common ${ATOMIC_LIBS})
add_test(timer_test timer_test) add_test(timer_test timer_test)
add_executable(network_utils_test network_utils_test.cc) add_executable(network_utils_test network_utils_test.cc)
@ -70,7 +70,7 @@ target_link_libraries(choice_type_test srsran_common)
add_test(choice_type_test choice_type_test) add_test(choice_type_test choice_type_test)
add_executable(task_scheduler_test task_scheduler_test.cc) add_executable(task_scheduler_test task_scheduler_test.cc)
target_link_libraries(task_scheduler_test srsran_common) target_link_libraries(task_scheduler_test srsran_common ${ATOMIC_LIBS})
add_test(task_scheduler_test task_scheduler_test) add_test(task_scheduler_test task_scheduler_test)
add_executable(pnf_dummy pnf_dummy.cc) add_executable(pnf_dummy pnf_dummy.cc)

4
lib/test/upper/CMakeLists.txt
Unescape Escape View File

@ -25,7 +25,7 @@ target_link_libraries(rlc_am_nr_pdu_test srsran_upper srsran_phy)
add_nr_test(rlc_am_nr_pdu_test rlc_am_nr_pdu_test) add_nr_test(rlc_am_nr_pdu_test rlc_am_nr_pdu_test)
add_executable(rlc_stress_test rlc_stress_test.cc) add_executable(rlc_stress_test rlc_stress_test.cc)
target_link_libraries(rlc_stress_test srsran_upper srsran_mac srsran_phy srsran_common ${Boost_LIBRARIES}) target_link_libraries(rlc_stress_test srsran_upper srsran_mac srsran_phy srsran_common ${Boost_LIBRARIES} ${ATOMIC_LIBS})
add_lte_test(rlc_am_stress_test rlc_stress_test --mode=AM --loglevel 1 --sdu_gen_delay 250) add_lte_test(rlc_am_stress_test rlc_stress_test --mode=AM --loglevel 1 --sdu_gen_delay 250)
add_lte_test(rlc_um_stress_test rlc_stress_test --mode=UM --loglevel 1) add_lte_test(rlc_um_stress_test rlc_stress_test --mode=UM --loglevel 1)
add_lte_test(rlc_tm_stress_test rlc_stress_test --mode=TM --loglevel 1 --random_opp=false) add_lte_test(rlc_tm_stress_test rlc_stress_test --mode=TM --loglevel 1 --random_opp=false)
@ -62,7 +62,7 @@ target_link_libraries(pdcp_nr_test_rx srsran_upper srsran_common)
add_nr_test(pdcp_nr_test_rx pdcp_nr_test_rx) add_nr_test(pdcp_nr_test_rx pdcp_nr_test_rx)
add_executable(pdcp_nr_test_discard_sdu pdcp_nr_test_discard_sdu.cc) add_executable(pdcp_nr_test_discard_sdu pdcp_nr_test_discard_sdu.cc)
target_link_libraries(pdcp_nr_test_discard_sdu srsran_upper srsran_common) target_link_libraries(pdcp_nr_test_discard_sdu srsran_upper srsran_common ${ATOMIC_LIBS})
add_nr_test(pdcp_nr_test_discard_sdu pdcp_nr_test_discard_sdu) add_nr_test(pdcp_nr_test_discard_sdu pdcp_nr_test_discard_sdu)
add_executable(pdcp_lte_test_rx pdcp_lte_test_rx.cc) add_executable(pdcp_lte_test_rx pdcp_lte_test_rx.cc)

8
srsenb/test/rrc/CMakeLists.txt
Unescape Escape View File

@ -10,17 +10,17 @@ add_library(test_helpers test_helpers.cc)
target_link_libraries(test_helpers srsenb_rrc srsenb_common rrc_asn1 s1ap_asn1 srsran_common enb_cfg_parser ${LIBCONFIGPP_LIBRARIES}) target_link_libraries(test_helpers srsenb_rrc srsenb_common rrc_asn1 s1ap_asn1 srsran_common enb_cfg_parser ${LIBCONFIGPP_LIBRARIES})
add_executable(rrc_nr_test rrc_nr_test.cc) add_executable(rrc_nr_test rrc_nr_test.cc)
target_link_libraries(rrc_nr_test srsgnb_rrc srsran_common rrc_nr_asn1) target_link_libraries(rrc_nr_test srsgnb_rrc srsran_common rrc_nr_asn1 ${ATOMIC_LIBS})
add_test(rrc_nr_test rrc_nr_test) add_test(rrc_nr_test rrc_nr_test)
add_executable(rrc_meascfg_test rrc_meascfg_test.cc) add_executable(rrc_meascfg_test rrc_meascfg_test.cc)
target_link_libraries(rrc_meascfg_test test_helpers) target_link_libraries(rrc_meascfg_test test_helpers ${ATOMIC_LIBS})
add_executable(erab_setup_test erab_setup_test.cc) add_executable(erab_setup_test erab_setup_test.cc)
target_link_libraries(erab_setup_test test_helpers ${LIBCONFIGPP_LIBRARIES}) target_link_libraries(erab_setup_test test_helpers ${LIBCONFIGPP_LIBRARIES} ${ATOMIC_LIBS})
add_executable(rrc_mobility_test rrc_mobility_test.cc) add_executable(rrc_mobility_test rrc_mobility_test.cc)
target_link_libraries(rrc_mobility_test srsran_asn1 test_helpers) target_link_libraries(rrc_mobility_test srsran_asn1 test_helpers ${ATOMIC_LIBS})
add_test(rrc_mobility_test rrc_mobility_test -i ${CMAKE_CURRENT_SOURCE_DIR}/../..) add_test(rrc_mobility_test rrc_mobility_test -i ${CMAKE_CURRENT_SOURCE_DIR}/../..)
add_test(erab_setup_test erab_setup_test -i ${CMAKE_CURRENT_SOURCE_DIR}/../..) add_test(erab_setup_test erab_setup_test -i ${CMAKE_CURRENT_SOURCE_DIR}/../..)

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

@ -29,7 +29,8 @@ set(SRSRAN_SOURCES ${SRSRAN_SOURCES} rrc_nr_asn1 ngap_nr_asn1)
target_link_libraries(srsue ${SRSUE_SOURCES} target_link_libraries(srsue ${SRSUE_SOURCES}
${SRSRAN_SOURCES} ${SRSRAN_SOURCES}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${Boost_LIBRARIES}) ${Boost_LIBRARIES}
${ATOMIC_LIBS})
if (RPATH) if (RPATH)
set_target_properties(srsue PROPERTIES INSTALL_RPATH ".") set_target_properties(srsue PROPERTIES INSTALL_RPATH ".")

6
srsue/src/stack/mac_nr/test/CMakeLists.txt
Unescape Escape View File

@ -7,11 +7,11 @@
# #
add_executable(proc_ra_nr_test proc_ra_nr_test.cc) add_executable(proc_ra_nr_test proc_ra_nr_test.cc)
target_link_libraries(proc_ra_nr_test srsue_mac_nr srsran_common) target_link_libraries(proc_ra_nr_test srsue_mac_nr srsran_common ${ATOMIC_LIBS})
add_test(proc_ra_nr_test proc_ra_nr_test) add_test(proc_ra_nr_test proc_ra_nr_test)
add_executable(proc_bsr_nr_test proc_bsr_nr_test.cc) add_executable(proc_bsr_nr_test proc_bsr_nr_test.cc)
target_link_libraries(proc_bsr_nr_test srsue_mac_nr srsran_common) target_link_libraries(proc_bsr_nr_test srsue_mac_nr srsran_common ${ATOMIC_LIBS})
add_test(proc_bsr_nr_test proc_bsr_nr_test) add_test(proc_bsr_nr_test proc_bsr_nr_test)
add_executable(proc_sr_nr_test proc_sr_nr_test.cc) add_executable(proc_sr_nr_test proc_sr_nr_test.cc)
@ -19,5 +19,5 @@ target_link_libraries(proc_sr_nr_test srsue_mac_nr srsran_common)
add_test(proc_sr_nr_test proc_sr_nr_test) add_test(proc_sr_nr_test proc_sr_nr_test)
add_executable(mac_nr_test mac_nr_test.cc) add_executable(mac_nr_test mac_nr_test.cc)
target_link_libraries(mac_nr_test srsue_mac_nr srsran_common) target_link_libraries(mac_nr_test srsue_mac_nr srsran_common ${ATOMIC_LIBS})
add_test(mac_nr_test mac_nr_test) add_test(mac_nr_test mac_nr_test)

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

@ -36,7 +36,7 @@ target_link_libraries(tft_test srsue_upper srsran_upper srsran_phy)
add_test(tft_test tft_test) add_test(tft_test tft_test)
add_executable(rrc_phy_ctrl_test rrc_phy_ctrl_test.cc) add_executable(rrc_phy_ctrl_test rrc_phy_ctrl_test.cc)
target_link_libraries(rrc_phy_ctrl_test srsran_common srsue_rrc) 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)

Write Preview
Loading…
Cancel
Save