removing unneeded install targets for static libs (reported by Filipe)

5 years ago · cccabdaf4f
parent 627dac49b0
commit cccabdaf4f
21 changed files with 22 additions and 69 deletions
--- a/lib/src/asn1/CMakeLists.txt
+++ b/lib/src/asn1/CMakeLists.txt
@ -26,11 +26,9 @@ add_library(srslte_asn1 STATIC
  liblte_m2ap.cc
  gtpc.cc
 )
-install(TARGETS srslte_asn1 DESTINATION ${LIBRARY_DIR})

-# Install ASN1 utils
+# ASN1 utils
 add_library(asn1_utils STATIC asn1_utils.cc)
-install(TARGETS asn1_utils DESTINATION ${LIBRARY_DIR})

 add_library(rrc_asn1 STATIC
        rrc_asn1.cc
@ -40,25 +38,22 @@ add_library(rrc_asn1 STATIC
 # Compile RRC ASN1 optimized for size
 target_compile_options(rrc_asn1 PRIVATE "-Os")
 target_link_libraries(rrc_asn1 asn1_utils)
-install(TARGETS rrc_asn1 DESTINATION ${LIBRARY_DIR})

 add_library(s1ap_asn1 STATIC
        s1ap_asn1.cc)
 target_compile_options(s1ap_asn1 PRIVATE "-Os")
 target_link_libraries(s1ap_asn1 asn1_utils)
-install(TARGETS s1ap_asn1 DESTINATION ${LIBRARY_DIR})

 if (ENABLE_5GNR)
-    # Install RRC NR ASN1
+    # RRC NR ASN1
    add_library(rrc_nr_asn1 STATIC rrc_nr_asn1.cc)
    target_compile_options(rrc_nr_asn1 PRIVATE "-Os")
    target_link_libraries(rrc_nr_asn1 asn1_utils)
-    install(TARGETS rrc_nr_asn1 DESTINATION ${LIBRARY_DIR})
-    # Install NGAP ASN1
+
+    # NGAP ASN1
    add_library(ngap_nr_asn1 STATIC ngap_nr_asn1.cc)
    target_compile_options(ngap_nr_asn1 PRIVATE "-Os")
    target_link_libraries(ngap_nr_asn1 asn1_utils)
-    install(TARGETS ngap_nr_asn1 DESTINATION ${LIBRARY_DIR})
 endif(ENABLE_5GNR)


--- a/lib/src/common/CMakeLists.txt
+++ b/lib/src/common/CMakeLists.txt
@ -58,6 +58,5 @@ add_executable(arch_select arch_select.cc)

 target_include_directories(srslte_common PUBLIC ${SEC_INCLUDE_DIRS})
 target_link_libraries(srslte_common srslte_phy ${SEC_LIBRARIES})
-install(TARGETS srslte_common DESTINATION ${LIBRARY_DIR})

 add_subdirectory(test)
--- a/lib/src/phy/CMakeLists.txt
+++ b/lib/src/phy/CMakeLists.txt
@ -53,10 +53,5 @@ set(srslte_srcs     $<TARGET_OBJECTS:srslte_agc>
        $<TARGET_OBJECTS:srslte_enb>
        )

-
-
 add_library(srslte_phy STATIC ${srslte_srcs})
-target_link_libraries(srslte_phy ${FFT_LIBRARIES})
-
-target_link_libraries(srslte_phy pthread m)
-install(TARGETS srslte_phy DESTINATION ${LIBRARY_DIR})
+target_link_libraries(srslte_phy pthread m ${FFT_LIBRARIES})
--- a/lib/src/radio/CMakeLists.txt
+++ b/lib/src/radio/CMakeLists.txt
@ -21,7 +21,6 @@
 if(RF_FOUND)
  add_library(srslte_radio STATIC radio.cc radio_multi.cc)
  target_link_libraries(srslte_radio srslte_rf)
-  install(TARGETS srslte_radio DESTINATION ${LIBRARY_DIR})
 endif(RF_FOUND)

 add_subdirectory(test)
--- a/lib/src/upper/CMakeLists.txt
+++ b/lib/src/upper/CMakeLists.txt
@ -35,4 +35,3 @@ endif(ENABLE_5GNR)

 add_library(srslte_upper STATIC ${SOURCES})
 target_link_libraries(srslte_upper srslte_common srslte_asn1)
-install(TARGETS srslte_upper DESTINATION ${LIBRARY_DIR})
--- a/srsenb/src/phy/CMakeLists.txt
+++ b/srsenb/src/phy/CMakeLists.txt
@ -24,6 +24,3 @@ add_library(srsenb_phy STATIC ${SOURCES})
 if(ENABLE_GUI AND SRSGUI_FOUND)
    target_link_libraries(srsenb_phy ${SRSGUI_LIBRARIES})
 endif(ENABLE_GUI AND SRSGUI_FOUND)
-
-install(TARGETS srsenb_phy DESTINATION ${LIBRARY_DIR})
-
--- a/srsenb/src/radio/CMakeLists.txt
+++ b/srsenb/src/radio/CMakeLists.txt
@ -20,4 +20,3 @@

 file(GLOB SOURCES "*.cc")
 add_library(srsenb_radio STATIC ${SOURCES})
-install(TARGETS srsenb_radio DESTINATION ${LIBRARY_DIR})
--- a/srsenb/src/stack/CMakeLists.txt
+++ b/srsenb/src/stack/CMakeLists.txt
@ -26,6 +26,3 @@ set(SOURCES enb_stack_lte.cc)

 add_library(srsenb_stack STATIC ${SOURCES})
 target_link_libraries(srsenb_stack)
-
-install(TARGETS srsenb_stack DESTINATION ${LIBRARY_DIR})
-
--- a/srsenb/src/stack/mac/CMakeLists.txt
+++ b/srsenb/src/stack/mac/CMakeLists.txt
@ -20,5 +20,3 @@

 file(GLOB SOURCES "*.cc")
 add_library(srsenb_mac STATIC ${SOURCES})
-install(TARGETS srsenb_mac DESTINATION ${LIBRARY_DIR})
-
--- a/srsenb/src/stack/rrc/CMakeLists.txt
+++ b/srsenb/src/stack/rrc/CMakeLists.txt
@ -19,7 +19,4 @@
 #

 set(SOURCES rrc.cc rrc_mobility.cc)
-
 add_library(srsenb_rrc STATIC ${SOURCES})
-
-install(TARGETS srsenb_rrc DESTINATION ${LIBRARY_DIR})
--- a/srsenb/src/stack/upper/CMakeLists.txt
+++ b/srsenb/src/stack/upper/CMakeLists.txt
@ -20,5 +20,3 @@

 file(GLOB SOURCES "*.cc")
 add_library(srsenb_upper STATIC ${SOURCES})
-install(TARGETS srsenb_upper DESTINATION ${LIBRARY_DIR})
-
--- a/srsepc/src/CMakeLists.txt
+++ b/srsepc/src/CMakeLists.txt
@ -60,9 +60,6 @@ if (RPATH)
  set_target_properties(srsmbms PROPERTIES INSTALL_RPATH ".")
 endif (RPATH)

-install(TARGETS srsepc DESTINATION ${RUNTIME_DIR})
-install(TARGETS srsmbms DESTINATION ${RUNTIME_DIR})
-
 ########################################################################
 # Option to run command after build (useful for remote builds)
 ########################################################################
@ -74,3 +71,4 @@ else(NOT ${BUILDEPC_CMD} STREQUAL "")
 endif (NOT ${BUILDEPC_CMD} STREQUAL "")

 install(TARGETS srsepc DESTINATION ${RUNTIME_DIR})
+install(TARGETS srsmbms DESTINATION ${RUNTIME_DIR})
--- a/srsepc/src/hss/CMakeLists.txt
+++ b/srsepc/src/hss/CMakeLists.txt
@ -20,5 +20,3 @@

 file(GLOB SOURCES "*.cc")
 add_library(srsepc_hss STATIC ${SOURCES})
-install(TARGETS srsepc_hss DESTINATION ${LIBRARY_DIR})
-
--- a/srsepc/src/mbms-gw/CMakeLists.txt
+++ b/srsepc/src/mbms-gw/CMakeLists.txt
@ -20,4 +20,3 @@

 file(GLOB SOURCES "*.cc")
 add_library(srsepc_mbms_gw STATIC ${SOURCES})
-install(TARGETS srsepc_mbms_gw DESTINATION ${LIBRARY_DIR})
--- a/srsepc/src/mme/CMakeLists.txt
+++ b/srsepc/src/mme/CMakeLists.txt
@ -20,5 +20,3 @@

 file(GLOB SOURCES "*.cc")
 add_library(srsepc_mme STATIC ${SOURCES})
-install(TARGETS srsepc_mme DESTINATION ${LIBRARY_DIR})
-
--- a/srsepc/src/spgw/CMakeLists.txt
+++ b/srsepc/src/spgw/CMakeLists.txt
@ -20,4 +20,3 @@

 file(GLOB SOURCES "*.cc")
 add_library(srsepc_sgw STATIC ${SOURCES})
-install(TARGETS srsepc_sgw DESTINATION ${LIBRARY_DIR})
--- a/srsue/src/phy/CMakeLists.txt
+++ b/srsue/src/phy/CMakeLists.txt
@ -24,5 +24,3 @@ add_library(srsue_phy STATIC ${SOURCES})
 if(ENABLE_GUI AND SRSGUI_FOUND)
  target_link_libraries(srsue_phy ${SRSGUI_LIBRARIES})
 endif(ENABLE_GUI AND SRSGUI_FOUND)
-
-install(TARGETS srsue_phy DESTINATION ${LIBRARY_DIR})
--- a/srsue/src/stack/CMakeLists.txt
+++ b/srsue/src/stack/CMakeLists.txt
@ -23,8 +23,4 @@ add_subdirectory(rrc)
 add_subdirectory(upper)

 set(SOURCES ue_stack_lte.cc)
-
 add_library(srsue_stack STATIC ${SOURCES})
-
-install(TARGETS srsue_stack DESTINATION ${LIBRARY_DIR})
-
--- a/srsue/src/stack/mac/CMakeLists.txt
+++ b/srsue/src/stack/mac/CMakeLists.txt
@ -20,4 +20,3 @@

 set(SOURCES demux.cc dl_harq.cc mac.cc mux.cc proc_bsr.cc proc_phr.cc proc_ra.cc proc_sr.cc ul_harq.cc)
 add_library(srsue_mac STATIC ${SOURCES})
-install(TARGETS srsue_mac DESTINATION ${LIBRARY_DIR})
--- a/srsue/src/stack/rrc/CMakeLists.txt
+++ b/srsue/src/stack/rrc/CMakeLists.txt
@ -19,7 +19,4 @@
 #

 set(SOURCES rrc.cc rrc_procedures.cc rrc_meas.cc)
-
 add_library(srsue_rrc STATIC ${SOURCES})
-
-install(TARGETS srsue_rrc DESTINATION ${LIBRARY_DIR})
--- a/srsue/src/stack/upper/CMakeLists.txt
+++ b/srsue/src/stack/upper/CMakeLists.txt
@ -29,5 +29,3 @@ add_library(srsue_upper STATIC ${SOURCES})
 if(HAVE_PCSC)
  target_link_libraries(srsue_upper ${PCSCLITE_LIBRARY})
 endif(HAVE_PCSC)
-
-install(TARGETS srsue_upper DESTINATION ${LIBRARY_DIR})