Fixed headers not installing

master
ismagom 10 years ago
parent 132c919dcf
commit 4684facd5b

@ -19,10 +19,14 @@
# and at http://www.gnu.org/licenses/. # and at http://www.gnu.org/licenses/.
# #
########################################################################
# Install headers
########################################################################
INCLUDE_DIRECTORIES(radio/include/) INCLUDE_DIRECTORIES(radio/include/)
INCLUDE_DIRECTORIES(common/include/) INCLUDE_DIRECTORIES(common/include/)
add_subdirectory(radio) add_subdirectory(radio)
add_subdirectory(ue)
add_subdirectory(common) add_subdirectory(common)
add_subdirectory(ue)

@ -19,10 +19,16 @@
# and at http://www.gnu.org/licenses/. # and at http://www.gnu.org/licenses/.
# #
INSTALL(DIRECTORY include/
DESTINATION "${INCLUDE_DIR}"
FILES_MATCHING PATTERN "*.h"
PATTERN ".svn" EXCLUDE
)
FILE(GLOB SOURCES "src/*.cc") FILE(GLOB SOURCES "src/*.cc")
ADD_LIBRARY(srsapps_common SHARED ${SOURCES}) ADD_LIBRARY(srsapps_common SHARED ${SOURCES})
INSTALL(TARGETS srsapps_common DESTINATION ${LIBRARY_DIR}) INSTALL(TARGETS srsapps_common DESTINATION ${LIBRARY_DIR})
LIBLTE_SET_PIC(srsapps_common) LIBLTE_SET_PIC(srsapps_common)
FILE(GLOB SOURCES "include/srsapps/common/*.h") FILE(GLOB HEADERS_ALL "include/srsapps/common/*.h")
ADD_CUSTOM_TARGET (add_srsapps_common_headers SOURCES ${HEADERS_ALL}) ADD_CUSTOM_TARGET (add_srsapps_common_headers SOURCES ${HEADERS_ALL})

@ -21,6 +21,12 @@
FIND_PACKAGE(UHD) FIND_PACKAGE(UHD)
INSTALL(DIRECTORY include/
DESTINATION "${INCLUDE_DIR}"
FILES_MATCHING PATTERN "*.h"
PATTERN ".svn" EXCLUDE
)
IF(UHD_FOUND) IF(UHD_FOUND)
FILE(GLOB SOURCES "src/*.cc") FILE(GLOB SOURCES "src/*.cc")
ADD_LIBRARY(srsapps_radio SHARED ${SOURCES}) ADD_LIBRARY(srsapps_radio SHARED ${SOURCES})
@ -28,5 +34,5 @@ IF(UHD_FOUND)
LIBLTE_SET_PIC(srsapps_radio) LIBLTE_SET_PIC(srsapps_radio)
ENDIF(UHD_FOUND) ENDIF(UHD_FOUND)
FILE(GLOB SOURCES "include/srsapps/radio/*.h") FILE(GLOB HEADERS_ALL "include/srsapps/radio/*.h")
ADD_CUSTOM_TARGET (add_srsapps_radio_headers SOURCES ${HEADERS_ALL}) ADD_CUSTOM_TARGET (add_srsapps_radio_headers SOURCES ${HEADERS_ALL})

@ -19,11 +19,17 @@
# and at http://www.gnu.org/licenses/. # and at http://www.gnu.org/licenses/.
# #
INSTALL(DIRECTORY include/
DESTINATION "${INCLUDE_DIR}"
FILES_MATCHING PATTERN "*.h"
PATTERN ".svn" EXCLUDE
)
FILE(GLOB SOURCES "src/*.cc") FILE(GLOB SOURCES "src/*.cc")
ADD_LIBRARY(srsapps_ue_mac SHARED ${SOURCES}) ADD_LIBRARY(srsapps_ue_mac SHARED ${SOURCES})
INSTALL(TARGETS srsapps_ue_mac DESTINATION ${LIBRARY_DIR}) INSTALL(TARGETS srsapps_ue_mac DESTINATION ${LIBRARY_DIR})
LIBLTE_SET_PIC(srsapps_ue_mac) LIBLTE_SET_PIC(srsapps_ue_mac)
FILE(GLOB SOURCES "include/*.h") FILE(GLOB HEADERS_ALL "include/srsapps/ue/mac/*.h")
ADD_CUSTOM_TARGET (add_srsapps_ue_mac_headers SOURCES ${HEADERS_ALL}) ADD_CUSTOM_TARGET (add_ue_mac_headers SOURCES ${HEADERS_ALL})

@ -19,13 +19,19 @@
# and at http://www.gnu.org/licenses/. # and at http://www.gnu.org/licenses/.
# #
INSTALL(DIRECTORY include/
DESTINATION "${INCLUDE_DIR}"
FILES_MATCHING PATTERN "*.h"
PATTERN ".svn" EXCLUDE
)
FILE(GLOB SOURCES "src/*.cc") FILE(GLOB SOURCES "src/*.cc")
ADD_LIBRARY(srsapps_ue_phy SHARED ${SOURCES}) ADD_LIBRARY(srsapps_ue_phy SHARED ${SOURCES})
TARGET_LINK_LIBRARIES(srsapps_ue_phy srsapps_common) TARGET_LINK_LIBRARIES(srsapps_ue_phy srsapps_common)
INSTALL(TARGETS srsapps_ue_phy DESTINATION ${LIBRARY_DIR}) INSTALL(TARGETS srsapps_ue_phy DESTINATION ${LIBRARY_DIR})
LIBLTE_SET_PIC(srsapps_ue_phy) LIBLTE_SET_PIC(srsapps_ue_phy)
FILE(GLOB SOURCES "include/srsapps/ue/phy/*.h") FILE(GLOB HEADERS_ALL "include/srsapps/ue/phy/*.h")
ADD_CUSTOM_TARGET (add_ue_phy_headers SOURCES ${HEADERS_ALL}) ADD_CUSTOM_TARGET (add_ue_phy_headers SOURCES ${HEADERS_ALL})
ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(test)

Loading…
Cancel
Save