From cccabdaf4f6fab90d41c311ccb52f9b6e1887db0 Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Thu, 6 Feb 2020 20:46:37 +0100 Subject: [PATCH] removing unneeded install targets for static libs (reported by Filipe) --- lib/src/asn1/CMakeLists.txt | 13 ++++--------- lib/src/common/CMakeLists.txt | 1 - lib/src/phy/CMakeLists.txt | 7 +------ lib/src/radio/CMakeLists.txt | 1 - lib/src/upper/CMakeLists.txt | 3 +-- srsenb/src/phy/CMakeLists.txt | 5 +---- srsenb/src/radio/CMakeLists.txt | 3 +-- srsenb/src/stack/CMakeLists.txt | 5 +---- srsenb/src/stack/mac/CMakeLists.txt | 4 +--- srsenb/src/stack/rrc/CMakeLists.txt | 5 +---- srsenb/src/stack/upper/CMakeLists.txt | 4 +--- srsepc/src/CMakeLists.txt | 4 +--- srsepc/src/hss/CMakeLists.txt | 4 +--- srsepc/src/mbms-gw/CMakeLists.txt | 3 +-- srsepc/src/mme/CMakeLists.txt | 4 +--- srsepc/src/spgw/CMakeLists.txt | 3 +-- srsue/src/phy/CMakeLists.txt | 4 +--- srsue/src/stack/CMakeLists.txt | 6 +----- srsue/src/stack/mac/CMakeLists.txt | 3 +-- srsue/src/stack/rrc/CMakeLists.txt | 5 +---- srsue/src/stack/upper/CMakeLists.txt | 4 +--- 21 files changed, 22 insertions(+), 69 deletions(-) diff --git a/lib/src/asn1/CMakeLists.txt b/lib/src/asn1/CMakeLists.txt index c1efa6a33..5e1a4792d 100644 --- 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) diff --git a/lib/src/common/CMakeLists.txt b/lib/src/common/CMakeLists.txt index 734cb58e9..844759229 100644 --- 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) \ No newline at end of file diff --git a/lib/src/phy/CMakeLists.txt b/lib/src/phy/CMakeLists.txt index 5a4b2707d..93d741771 100644 --- a/lib/src/phy/CMakeLists.txt +++ b/lib/src/phy/CMakeLists.txt @@ -53,10 +53,5 @@ set(srslte_srcs $ $ ) - - 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}) \ No newline at end of file diff --git a/lib/src/radio/CMakeLists.txt b/lib/src/radio/CMakeLists.txt index 053951b18..eff43c47b 100644 --- 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) diff --git a/lib/src/upper/CMakeLists.txt b/lib/src/upper/CMakeLists.txt index d88536948..3172a9899 100644 --- a/lib/src/upper/CMakeLists.txt +++ b/lib/src/upper/CMakeLists.txt @@ -34,5 +34,4 @@ if (ENABLE_5GNR) 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}) \ No newline at end of file +target_link_libraries(srslte_upper srslte_common srslte_asn1) \ No newline at end of file diff --git a/srsenb/src/phy/CMakeLists.txt b/srsenb/src/phy/CMakeLists.txt index d450272b0..bdd5797a5 100644 --- a/srsenb/src/phy/CMakeLists.txt +++ b/srsenb/src/phy/CMakeLists.txt @@ -23,7 +23,4 @@ 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}) - +endif(ENABLE_GUI AND SRSGUI_FOUND) \ No newline at end of file diff --git a/srsenb/src/radio/CMakeLists.txt b/srsenb/src/radio/CMakeLists.txt index e2ad78797..638d25d3f 100644 --- a/srsenb/src/radio/CMakeLists.txt +++ b/srsenb/src/radio/CMakeLists.txt @@ -19,5 +19,4 @@ # file(GLOB SOURCES "*.cc") -add_library(srsenb_radio STATIC ${SOURCES}) -install(TARGETS srsenb_radio DESTINATION ${LIBRARY_DIR}) +add_library(srsenb_radio STATIC ${SOURCES}) \ No newline at end of file diff --git a/srsenb/src/stack/CMakeLists.txt b/srsenb/src/stack/CMakeLists.txt index b4a83094a..73e1e3e81 100644 --- a/srsenb/src/stack/CMakeLists.txt +++ b/srsenb/src/stack/CMakeLists.txt @@ -25,7 +25,4 @@ add_subdirectory(upper) set(SOURCES enb_stack_lte.cc) add_library(srsenb_stack STATIC ${SOURCES}) -target_link_libraries(srsenb_stack) - -install(TARGETS srsenb_stack DESTINATION ${LIBRARY_DIR}) - +target_link_libraries(srsenb_stack) \ No newline at end of file diff --git a/srsenb/src/stack/mac/CMakeLists.txt b/srsenb/src/stack/mac/CMakeLists.txt index d46c5a206..2b1451d2c 100644 --- a/srsenb/src/stack/mac/CMakeLists.txt +++ b/srsenb/src/stack/mac/CMakeLists.txt @@ -19,6 +19,4 @@ # file(GLOB SOURCES "*.cc") -add_library(srsenb_mac STATIC ${SOURCES}) -install(TARGETS srsenb_mac DESTINATION ${LIBRARY_DIR}) - +add_library(srsenb_mac STATIC ${SOURCES}) \ No newline at end of file diff --git a/srsenb/src/stack/rrc/CMakeLists.txt b/srsenb/src/stack/rrc/CMakeLists.txt index 8758a7320..09d6f6f3f 100644 --- 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}) +add_library(srsenb_rrc STATIC ${SOURCES}) \ No newline at end of file diff --git a/srsenb/src/stack/upper/CMakeLists.txt b/srsenb/src/stack/upper/CMakeLists.txt index a06b4bf55..c2b315e67 100644 --- a/srsenb/src/stack/upper/CMakeLists.txt +++ b/srsenb/src/stack/upper/CMakeLists.txt @@ -19,6 +19,4 @@ # file(GLOB SOURCES "*.cc") -add_library(srsenb_upper STATIC ${SOURCES}) -install(TARGETS srsenb_upper DESTINATION ${LIBRARY_DIR}) - +add_library(srsenb_upper STATIC ${SOURCES}) \ No newline at end of file diff --git a/srsepc/src/CMakeLists.txt b/srsepc/src/CMakeLists.txt index 44d3424db..44ec45fe0 100644 --- 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}) diff --git a/srsepc/src/hss/CMakeLists.txt b/srsepc/src/hss/CMakeLists.txt index ea077a22f..e3a0ab842 100644 --- a/srsepc/src/hss/CMakeLists.txt +++ b/srsepc/src/hss/CMakeLists.txt @@ -19,6 +19,4 @@ # file(GLOB SOURCES "*.cc") -add_library(srsepc_hss STATIC ${SOURCES}) -install(TARGETS srsepc_hss DESTINATION ${LIBRARY_DIR}) - +add_library(srsepc_hss STATIC ${SOURCES}) \ No newline at end of file diff --git a/srsepc/src/mbms-gw/CMakeLists.txt b/srsepc/src/mbms-gw/CMakeLists.txt index dd33a7562..18ca7821c 100644 --- a/srsepc/src/mbms-gw/CMakeLists.txt +++ b/srsepc/src/mbms-gw/CMakeLists.txt @@ -19,5 +19,4 @@ # file(GLOB SOURCES "*.cc") -add_library(srsepc_mbms_gw STATIC ${SOURCES}) -install(TARGETS srsepc_mbms_gw DESTINATION ${LIBRARY_DIR}) +add_library(srsepc_mbms_gw STATIC ${SOURCES}) \ No newline at end of file diff --git a/srsepc/src/mme/CMakeLists.txt b/srsepc/src/mme/CMakeLists.txt index 97d90cbc7..8ebb9efad 100644 --- a/srsepc/src/mme/CMakeLists.txt +++ b/srsepc/src/mme/CMakeLists.txt @@ -19,6 +19,4 @@ # file(GLOB SOURCES "*.cc") -add_library(srsepc_mme STATIC ${SOURCES}) -install(TARGETS srsepc_mme DESTINATION ${LIBRARY_DIR}) - +add_library(srsepc_mme STATIC ${SOURCES}) \ No newline at end of file diff --git a/srsepc/src/spgw/CMakeLists.txt b/srsepc/src/spgw/CMakeLists.txt index b3ebda999..514439b14 100644 --- a/srsepc/src/spgw/CMakeLists.txt +++ b/srsepc/src/spgw/CMakeLists.txt @@ -19,5 +19,4 @@ # file(GLOB SOURCES "*.cc") -add_library(srsepc_sgw STATIC ${SOURCES}) -install(TARGETS srsepc_sgw DESTINATION ${LIBRARY_DIR}) +add_library(srsepc_sgw STATIC ${SOURCES}) \ No newline at end of file diff --git a/srsue/src/phy/CMakeLists.txt b/srsue/src/phy/CMakeLists.txt index 31321a244..04be8e314 100644 --- a/srsue/src/phy/CMakeLists.txt +++ b/srsue/src/phy/CMakeLists.txt @@ -23,6 +23,4 @@ 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}) +endif(ENABLE_GUI AND SRSGUI_FOUND) \ No newline at end of file diff --git a/srsue/src/stack/CMakeLists.txt b/srsue/src/stack/CMakeLists.txt index 47a9b10b3..fde3782f5 100644 --- 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}) - +add_library(srsue_stack STATIC ${SOURCES}) \ No newline at end of file diff --git a/srsue/src/stack/mac/CMakeLists.txt b/srsue/src/stack/mac/CMakeLists.txt index 5ecf74b18..863c91c30 100644 --- a/srsue/src/stack/mac/CMakeLists.txt +++ b/srsue/src/stack/mac/CMakeLists.txt @@ -19,5 +19,4 @@ # 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}) +add_library(srsue_mac STATIC ${SOURCES}) \ No newline at end of file diff --git a/srsue/src/stack/rrc/CMakeLists.txt b/srsue/src/stack/rrc/CMakeLists.txt index 103b04720..6cc7aa3b3 100644 --- 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}) +add_library(srsue_rrc STATIC ${SOURCES}) \ No newline at end of file diff --git a/srsue/src/stack/upper/CMakeLists.txt b/srsue/src/stack/upper/CMakeLists.txt index 30a9c3e7c..d5378255f 100644 --- a/srsue/src/stack/upper/CMakeLists.txt +++ b/srsue/src/stack/upper/CMakeLists.txt @@ -28,6 +28,4 @@ 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}) +endif(HAVE_PCSC) \ No newline at end of file