From 107f6334dd625f8e7ea26ce95630cc54ebbec9f8 Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Wed, 2 Jun 2021 14:44:32 +0200 Subject: [PATCH] compile: fix compilation on 32bit systems that require -latomic --- lib/src/upper/CMakeLists.txt | 2 +- lib/test/common/CMakeLists.txt | 4 ++-- lib/test/upper/CMakeLists.txt | 4 ++-- srsenb/test/rrc/CMakeLists.txt | 8 ++++---- srsue/src/CMakeLists.txt | 3 ++- srsue/src/stack/mac_nr/test/CMakeLists.txt | 6 +++--- srsue/test/upper/CMakeLists.txt | 2 +- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/lib/src/upper/CMakeLists.txt b/lib/src/upper/CMakeLists.txt index 9d70b93ad..c6b65ba10 100644 --- a/lib/src/upper/CMakeLists.txt +++ b/lib/src/upper/CMakeLists.txt @@ -22,5 +22,5 @@ set(SOURCES gtpu.cc bearer_mem_pool.cc) 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}) diff --git a/lib/test/common/CMakeLists.txt b/lib/test/common/CMakeLists.txt index 4ea720a21..1b731e167 100644 --- a/lib/test/common/CMakeLists.txt +++ b/lib/test/common/CMakeLists.txt @@ -54,7 +54,7 @@ target_link_libraries(queue_test srsran_common ${CMAKE_THREAD_LIBS_INIT}) add_test(queue_test queue_test) 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_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_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_executable(pnf_dummy pnf_dummy.cc) diff --git a/lib/test/upper/CMakeLists.txt b/lib/test/upper/CMakeLists.txt index e17961e96..b17495db8 100644 --- a/lib/test/upper/CMakeLists.txt +++ b/lib/test/upper/CMakeLists.txt @@ -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_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_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) @@ -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_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_executable(pdcp_lte_test_rx pdcp_lte_test_rx.cc) diff --git a/srsenb/test/rrc/CMakeLists.txt b/srsenb/test/rrc/CMakeLists.txt index c6e86a03d..2a57744b2 100644 --- a/srsenb/test/rrc/CMakeLists.txt +++ b/srsenb/test/rrc/CMakeLists.txt @@ -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}) 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_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) -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) -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(erab_setup_test erab_setup_test -i ${CMAKE_CURRENT_SOURCE_DIR}/../..) diff --git a/srsue/src/CMakeLists.txt b/srsue/src/CMakeLists.txt index 6b8d0e653..aa6809c9f 100644 --- a/srsue/src/CMakeLists.txt +++ b/srsue/src/CMakeLists.txt @@ -29,7 +29,8 @@ set(SRSRAN_SOURCES ${SRSRAN_SOURCES} rrc_nr_asn1 ngap_nr_asn1) target_link_libraries(srsue ${SRSUE_SOURCES} ${SRSRAN_SOURCES} ${CMAKE_THREAD_LIBS_INIT} - ${Boost_LIBRARIES}) + ${Boost_LIBRARIES} + ${ATOMIC_LIBS}) if (RPATH) set_target_properties(srsue PROPERTIES INSTALL_RPATH ".") diff --git a/srsue/src/stack/mac_nr/test/CMakeLists.txt b/srsue/src/stack/mac_nr/test/CMakeLists.txt index d9039c278..76ad50743 100644 --- a/srsue/src/stack/mac_nr/test/CMakeLists.txt +++ b/srsue/src/stack/mac_nr/test/CMakeLists.txt @@ -7,11 +7,11 @@ # 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_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_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_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) \ No newline at end of file diff --git a/srsue/test/upper/CMakeLists.txt b/srsue/test/upper/CMakeLists.txt index 959712a34..f3e3cc3db 100644 --- a/srsue/test/upper/CMakeLists.txt +++ b/srsue/test/upper/CMakeLists.txt @@ -36,7 +36,7 @@ target_link_libraries(tft_test srsue_upper srsran_upper srsran_phy) add_test(tft_test tft_test) 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_executable(rrc_cell_test rrc_cell_test.cc)