diff --git a/CMakeLists.txt b/CMakeLists.txt index 17609e65f..62a56371b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}") diff --git a/lib/src/phy/CMakeLists.txt b/lib/src/phy/CMakeLists.txt index 26271f2a7..7f26f9836 100644 --- a/lib/src/phy/CMakeLists.txt +++ b/lib/src/phy/CMakeLists.txt @@ -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}) diff --git a/srsenb/src/CMakeLists.txt b/srsenb/src/CMakeLists.txt index 23272ea85..a83e974a8 100644 --- a/srsenb/src/CMakeLists.txt +++ b/srsenb/src/CMakeLists.txt @@ -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) diff --git a/srsue/src/CMakeLists.txt b/srsue/src/CMakeLists.txt index 1c6b87bc1..4b2a7e282 100644 --- a/srsue/src/CMakeLists.txt +++ b/srsue/src/CMakeLists.txt @@ -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) ########################################################################