fix nr optional linking

srsenb/src/CMakeLists.txt

@@ -35,26 +35,17 @@ endif (RPATH)
 add_library(enb_cfg_parser parser.cc enb_cfg_parser.cc)
 
 add_executable(srsenb main.cc enb.cc metrics_stdout.cc metrics_csv.cc)
-target_link_libraries(srsenb  srsenb_phy
-                              srsenb_stack
-                              srsenb_upper
-                              srsenb_mac
-                              srsenb_rrc
-                              srsgnb_phy
-                              srsgnb_stack
-                              srsgnb_upper
-                              srsgnb_mac
-                              srsgnb_rrc
-                              srslte_common
-                              srslte_mac
-                              srslte_phy
-                              srslte_upper
-                              srslte_radio
-                              rrc_asn1
-                              s1ap_asn1
-                              enb_cfg_parser
-                              rrc_nr_asn1
-                              ngap_nr_asn1
+
+set(SRSENB_SOURCES srsenb_phy srsenb_stack srsenb_upper srsenb_mac srsenb_rrc)
+set(SRSLTE_SOURCES srslte_common srslte_mac srslte_phy srslte_upper srslte_radio rrc_asn1 s1ap_asn1 enb_cfg_parser)
+
+if(ENABLE_5GNR)
+  set(SRSENB_SOURCES ${SRSENB_SOURCES} srsgnb_phy srsgnb_stack srsgnb_upper srsgnb_mac srsgnb_rrc)
+  set(SRSLTE_SOURCES ${SRSLTE_SOURCES} rrc_nr_asn1 ngap_nr_asn1)
+endif()
+
+target_link_libraries(srsenb  ${SRSENB_SOURCES}
+                              ${SRSLTE_SOURCES}
                               ${CMAKE_THREAD_LIBS_INIT}
                               ${Boost_LIBRARIES} 
                               ${SEC_LIBRARIES}

srsue/src/CMakeLists.txt

@@ -31,22 +31,17 @@ if (RPATH)
 endif (RPATH)
 
 add_executable(srsue main.cc ue.cc metrics_stdout.cc metrics_csv.cc)
-target_link_libraries(srsue   srsue_phy
-                              srsue_stack
-                              srsue_upper
-                              srsue_mac
-                              srsue_rrc
-                              srsue_nr_stack
-                              srsue_rrc_nr
-                              srsue_mac_nr
-                              srslte_common
-                              srslte_mac
-                              srslte_phy
-                              srslte_radio
-                              srslte_upper
-                              rrc_asn1
-                              rrc_nr_asn1
-                              ngap_nr_asn1
+
+set(SRSUE_SOURCES srsue_phy srsue_stack srsue_upper srsue_mac srsue_rrc)
+set(SRSLTE_SOURCES srslte_common srslte_mac srslte_phy srslte_radio srslte_upper rrc_asn1)
+
+if(ENABLE_5GNR)
+  set(SRSUE_SOURCES ${SRSUE_SOURCES} srsue_nr_stack srsue_rrc_nr srsue_mac_nr)
+  set(SRSLTE_SOURCES ${SRSLTE_SOURCES} rrc_nr_asn1 ngap_nr_asn1)
+endif()
+
+target_link_libraries(srsue   ${SRSUE_SOURCES}
+                              ${SRSLTE_SOURCES}
                               ${CMAKE_THREAD_LIBS_INIT}
                               ${Boost_LIBRARIES})