From 23203b73ae1bade455fd73adbcf110af8525ebcf Mon Sep 17 00:00:00 2001
From: Francisco <francisco.paisana@softwareradiosystems.com>
Date: Tue, 20 Apr 2021 22:27:18 +0100
Subject: [PATCH] fix - avoid recompiling srsue rrc files twice

---
 srsue/src/stack/rrc/CMakeLists.txt  | 5 +++--
 srsue/test/ttcn3/src/CMakeLists.txt | 4 ++--
 srsue/test/upper/CMakeLists.txt     | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/srsue/src/stack/rrc/CMakeLists.txt b/srsue/src/stack/rrc/CMakeLists.txt
index 434c9e077..25ff70553 100644
--- a/srsue/src/stack/rrc/CMakeLists.txt
+++ b/srsue/src/stack/rrc/CMakeLists.txt
@@ -6,8 +6,9 @@
 # the distribution.
 #
 
-set(SOURCES rrc.cc rrc_nr.cc rrc_procedures.cc rrc_meas.cc rrc_cell.cc phy_controller.cc)
-
+set(SOURCES rrc.cc rrc_procedures.cc rrc_meas.cc rrc_cell.cc phy_controller.cc)
 add_library(srsue_rrc STATIC ${SOURCES})
+
+set(SOURCES rrc_nr.cc)
 add_library(srsue_rrc_nr STATIC ${SOURCES})
 
diff --git a/srsue/test/ttcn3/src/CMakeLists.txt b/srsue/test/ttcn3/src/CMakeLists.txt
index e4a14469d..943df04fb 100644
--- a/srsue/test/ttcn3/src/CMakeLists.txt
+++ b/srsue/test/ttcn3/src/CMakeLists.txt
@@ -12,10 +12,10 @@ add_executable(ttcn3_dut ttcn3_dut.cc lte_ttcn3_phy.cc ${SOURCES})
 set(LINK_LIBRARIES srsue_stack
                     srsue_upper
                     srsue_rrc
+                    srsue_rrc_nr
                     srsran_upper
                     srsran_common
                     srsran_mac
-                    srsran_mac
                     srsran_phy
                     srsran_radio
                     srsran_upper
@@ -25,7 +25,7 @@ set(LINK_LIBRARIES srsue_stack
                     rrc_asn1
                     rrc_nr_asn1
                     sctp
-${Boost_LIBRARIES})
+                    ${Boost_LIBRARIES})
 
 target_link_libraries(ttcn3_dut ${LINK_LIBRARIES})
 
diff --git a/srsue/test/upper/CMakeLists.txt b/srsue/test/upper/CMakeLists.txt
index 06832a052..959712a34 100644
--- a/srsue/test/upper/CMakeLists.txt
+++ b/srsue/test/upper/CMakeLists.txt
@@ -44,7 +44,7 @@ target_link_libraries(rrc_cell_test srsue_rrc srsue_upper srsran_upper srsran_ph
 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 srsue_upper srsran_upper srsran_phy rrc_asn1 rrc_nr_asn1)
+target_link_libraries(ue_rrc_nr_test srsue_rrc_nr srsue_upper srsran_common srsran_upper srsran_phy rrc_asn1 rrc_nr_asn1)
 
 ########################################################################
 # Option to run command after build (useful for remote builds)