Moving fftw checks to top CMakeLists

This commit is contained in:
Paul Sutton 2017-06-23 15:51:36 +01:00
parent b71f7b7080
commit 776c1bbc9d
4 changed files with 17 additions and 14 deletions

View File

@ -76,6 +76,18 @@ set(GCC_ARCH native CACHE STRING "GCC compile for specific architecture.")
########################################################################
find_package(Threads REQUIRED)
find_package(MKL)
if(MKL_FOUND)
include_directories(${MKL_INCLUDE_DIRS})
link_directories(${MKL_LIBRARY_DIRS})
else(MKL_FOUND)
find_package(FFTW3F REQUIRED)
if(FFTW3F_FOUND)
include_directories(${FFTW3F_INCLUDE_DIRS})
link_directories(${FFTW3F_LIBRARY_DIRS})
endif(FFTW3F_FOUND)
endif(MKL_FOUND)
find_package(Polarssl)
if (POLARSSL_FOUND)
set(SEC_INCLUDE_DIRS "${POLARSSL_INCLUDE_DIRS}")

View File

@ -58,19 +58,6 @@ add_library(srslte_phy STATIC ${srslte_srcs})
set_target_properties(srslte_phy PROPERTIES
VERSION ${SRSLTE_VERSION_MAJOR}.${SRSLTE_VERSION_MINOR})
find_package(MKL)
if(MKL_FOUND)
include_directories(${MKL_INCLUDE_DIRS})
link_directories(${MKL_LIBRARY_DIRS})
else(MKL_FOUND)
find_package(FFTW3F REQUIRED)
if(FFTW3F_FOUND)
include_directories(${FFTW3F_INCLUDE_DIRS})
link_directories(${FFTW3F_LIBRARY_DIRS})
endif(FFTW3F_FOUND)
endif(MKL_FOUND)
if(MKL_FOUND)
if(BUILD_STATIC)
target_link_libraries(srslte_phy ${MKL_STATIC_LIBRARIES})

View File

@ -31,7 +31,9 @@ target_link_libraries(srsenb srsenb_upper
if (RPATH)
set_target_properties(srsenb PROPERTIES INSTALL_RPATH ".")
endif (RPATH)
endif (RPATH)
install(TARGETS srsenb DESTINATION ${RUNTIME_DIR})
########################################################################
# Option to run command after build (useful for remote builds)

View File

@ -46,6 +46,8 @@ if (RPATH)
set_target_properties(srsue PROPERTIES INSTALL_RPATH ".")
endif (RPATH)
install(TARGETS srsue DESTINATION ${RUNTIME_DIR})
########################################################################
# Option to run command after build (useful for remote builds)
########################################################################