mirror of https://github.com/PentHertz/srsLTE.git
Merge branch 'next' of https://github.com/srslte/srslte into novolk
This commit is contained in:
commit
ab0d946a68
|
@ -5,11 +5,16 @@
|
||||||
# MKL_LIBRARIES - The libraries needed to use mkl
|
# MKL_LIBRARIES - The libraries needed to use mkl
|
||||||
# MKL_DEFINITIONS - Compiler switches required for using mkl
|
# MKL_DEFINITIONS - Compiler switches required for using mkl
|
||||||
|
|
||||||
find_path(MKL_INCLUDE_DIRS
|
find_path(MKL_INCLUDE_DIR
|
||||||
NAMES mkl.h
|
NAMES mkl.h
|
||||||
HINTS $ENV{MKL_DIR}/include
|
HINTS $ENV{MKL_DIR}/include
|
||||||
PATHS)
|
PATHS)
|
||||||
|
|
||||||
|
find_path(MKL_FFTW_INCLUDE_DIR
|
||||||
|
NAMES fftw3.h
|
||||||
|
HINTS $ENV{MKL_DIR}/include/fftw
|
||||||
|
PATHS)
|
||||||
|
|
||||||
find_library(MKL_LIBRARIES
|
find_library(MKL_LIBRARIES
|
||||||
NAMES mkl_rt
|
NAMES mkl_rt
|
||||||
HINTS $ENV{MKL_DIR}/lib/intel64
|
HINTS $ENV{MKL_DIR}/lib/intel64
|
||||||
|
@ -31,6 +36,7 @@ find_library(MKL_SEQ
|
||||||
PATHS)
|
PATHS)
|
||||||
|
|
||||||
set(MKL_STATIC_LIBRARIES -Wl,--start-group ${MKL_CORE} ${MKL_ILP} ${MKL_SEQ} -Wl,--end-group -lpthread -lm -ldl)
|
set(MKL_STATIC_LIBRARIES -Wl,--start-group ${MKL_CORE} ${MKL_ILP} ${MKL_SEQ} -Wl,--end-group -lpthread -lm -ldl)
|
||||||
|
set(MKL_INCLUDE_DIRS ${MKL_INCLUDE_DIR} ${MKL_FFTW_INCLUDE_DIR})
|
||||||
|
|
||||||
include(FindPackageHandleStandardArgs)
|
include(FindPackageHandleStandardArgs)
|
||||||
# handle the QUIETLY and REQUIRED arguments and set MKL_FOUND to TRUE
|
# handle the QUIETLY and REQUIRED arguments and set MKL_FOUND to TRUE
|
||||||
|
|
|
@ -46,7 +46,6 @@ add_custom_target (add_srslte_headers SOURCES ${HEADERS_ALL})
|
||||||
find_package(MKL)
|
find_package(MKL)
|
||||||
if(MKL_FOUND)
|
if(MKL_FOUND)
|
||||||
include_directories(${MKL_INCLUDE_DIRS})
|
include_directories(${MKL_INCLUDE_DIRS})
|
||||||
include_directories(${MKL_INCLUDE_DIRS}/fftw)
|
|
||||||
link_directories(${MKL_LIBRARY_DIRS})
|
link_directories(${MKL_LIBRARY_DIRS})
|
||||||
else(MKL_FOUND)
|
else(MKL_FOUND)
|
||||||
find_package(FFTW3F REQUIRED)
|
find_package(FFTW3F REQUIRED)
|
||||||
|
|
Loading…
Reference in New Issue