mirror of https://github.com/PentHertz/srsLTE.git
Merge branch 'master' into tdec
This commit is contained in:
commit
c64882d9c2
|
@ -1,5 +1,5 @@
|
||||||
INCLUDE(FindPkgConfig)
|
INCLUDE(FindPkgConfig)
|
||||||
PKG_CHECK_MODULES(UHD uhd)
|
#PKG_CHECK_MODULES(UHD uhd)
|
||||||
IF(NOT UHD_FOUND)
|
IF(NOT UHD_FOUND)
|
||||||
|
|
||||||
FIND_PATH(
|
FIND_PATH(
|
||||||
|
@ -20,7 +20,11 @@ FIND_LIBRARY(
|
||||||
/usr/local/lib32
|
/usr/local/lib32
|
||||||
)
|
)
|
||||||
|
|
||||||
|
message(STATUS "UHD LIBRARIES " ${UHD_LIBRARIES})
|
||||||
|
message(STATUS "UHD INCLUDE DIRS " ${UHD_INCLUDE_DIRS})
|
||||||
|
|
||||||
INCLUDE(FindPackageHandleStandardArgs)
|
INCLUDE(FindPackageHandleStandardArgs)
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(UHD DEFAULT_MSG UHD_LIBRARIES UHD_INCLUDE_DIRS)
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(UHD DEFAULT_MSG UHD_LIBRARIES UHD_INCLUDE_DIRS)
|
||||||
|
MARK_AS_ADVANCED(UHD_LIBRARIES UHD_INCLUDE_DIRS)
|
||||||
|
|
||||||
ENDIF(NOT UHD_FOUND)
|
ENDIF(NOT UHD_FOUND)
|
||||||
|
|
|
@ -41,6 +41,11 @@ FOREACH (_header ${headers})
|
||||||
ENDFOREACH()
|
ENDFOREACH()
|
||||||
ADD_CUSTOM_TARGET (add_srslte_headers SOURCES ${HEADERS_ALL})
|
ADD_CUSTOM_TARGET (add_srslte_headers SOURCES ${HEADERS_ALL})
|
||||||
|
|
||||||
|
########################################################################
|
||||||
|
# Find Dependencies
|
||||||
|
########################################################################
|
||||||
|
FIND_PACKAGE(UHD)
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
# Add subdirectories
|
# Add subdirectories
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
include(CheckFunctionExistsMath)
|
include(CheckFunctionExistsMath)
|
||||||
|
|
||||||
FIND_PACKAGE(SRSGUI)
|
FIND_PACKAGE(SRSGUI)
|
||||||
FIND_PACKAGE(UHD)
|
|
||||||
FIND_PACKAGE(FFTW3F REQUIRED) # TODO: distribute kissfft instead
|
FIND_PACKAGE(FFTW3F REQUIRED) # TODO: distribute kissfft instead
|
||||||
|
|
||||||
IF(${DISABLE_VOLK})
|
IF(${DISABLE_VOLK})
|
||||||
|
|
Loading…
Reference in New Issue