From 930147fcda000ef8459f727115790ad6dc7fcaa3 Mon Sep 17 00:00:00 2001 From: Ismael Gomez Date: Fri, 2 Jun 2017 11:53:51 +0200 Subject: [PATCH] moved boost requirement to root cmake --- CMakeLists.txt | 40 +++++++++++++++++++++++++++++++-------- lib/src/phy/fec/viterbi.c | 1 - srsenb/CMakeLists.txt | 27 -------------------------- srsue/CMakeLists.txt | 29 ++-------------------------- 4 files changed, 34 insertions(+), 63 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ff2ba916f..de6363bd7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,6 +61,8 @@ set(GCC_ARCH native CACHE STRING "GCC compile for specific architecture.") ######################################################################## # Find dependencies ######################################################################## +find_package(Threads REQUIRED) + find_package(Polarssl) if (POLARSSL_FOUND) @@ -134,14 +136,6 @@ else(${DISABLE_VOLK}) find_package(Volk) endif(${DISABLE_VOLK}) -if(VOLK_FOUND) - include_directories(${VOLK_INCLUDE_DIRS}) - link_directories(${VOLK_LIBRARY_DIRS}) - message(STATUS " Compiling with VOLK SIMD library.") -else(VOLK_FOUND) - message(STATUS " VOLK SIMD library NOT found. Using generic implementation.") -endif(VOLK_FOUND) - if(ENABLE_GUI) find_package(SRSGUI) @@ -152,6 +146,36 @@ if(ENABLE_GUI) endif(SRSGUI_FOUND) endif(ENABLE_GUI) +######################################################################## +# Find boost +######################################################################## +set(BOOST_REQUIRED_COMPONENTS + program_options + system +) +if(UNIX AND EXISTS "/usr/lib64") + list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix +endif(UNIX AND EXISTS "/usr/lib64") +set(Boost_ADDITIONAL_VERSIONS + "1.35.0" "1.35" "1.36.0" "1.36" "1.37.0" "1.37" "1.38.0" "1.38" "1.39.0" "1.39" + "1.40.0" "1.40" "1.41.0" "1.41" "1.42.0" "1.42" "1.43.0" "1.43" "1.44.0" "1.44" + "1.45.0" "1.45" "1.46.0" "1.46" "1.47.0" "1.47" "1.48.0" "1.48" "1.49.0" "1.49" + "1.50.0" "1.50" "1.51.0" "1.51" "1.52.0" "1.52" "1.53.0" "1.53" "1.54.0" "1.54" + "1.55.0" "1.55" "1.56.0" "1.56" "1.57.0" "1.57" "1.58.0" "1.58" "1.59.0" "1.59" + "1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64" + "1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69" +) +find_package(Boost "1.35" COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) + + +if(VOLK_FOUND) + include_directories(${VOLK_INCLUDE_DIRS}) + link_directories(${VOLK_LIBRARY_DIRS}) + message(STATUS " Compiling with VOLK SIMD library.") +else(VOLK_FOUND) + message(STATUS " VOLK SIMD library NOT found. Using generic implementation.") +endif(VOLK_FOUND) + ######################################################################## # Install Dirs diff --git a/lib/src/phy/fec/viterbi.c b/lib/src/phy/fec/viterbi.c index d1f4c1510..cdff3216f 100644 --- a/lib/src/phy/fec/viterbi.c +++ b/lib/src/phy/fec/viterbi.c @@ -344,7 +344,6 @@ int init37_avx2(srslte_viterbi_t *q, int poly[3], uint32_t framebits, bool tail_ q->decode = decode37_avx2; q->free = free37_avx2; q->decode_f = NULL; - printf("USING AVX VITERBI\n"); q->symbols_uc = srslte_vec_malloc(3 * (q->framebits + q->K - 1) * sizeof(uint8_t)); if (!q->symbols_uc) { perror("malloc"); diff --git a/srsenb/CMakeLists.txt b/srsenb/CMakeLists.txt index ed7ed1f1d..f95ad191c 100644 --- a/srsenb/CMakeLists.txt +++ b/srsenb/CMakeLists.txt @@ -25,37 +25,10 @@ if(STATIC_LIBCONFIGPP) set(LIBCONFIGPP_LIBRARIES "${LIBCONFIGPP_STATIC_LIBRARY_PATH}") endif(STATIC_LIBCONFIGPP) -######################################################################## -# Find boost -######################################################################## -set(BOOST_REQUIRED_COMPONENTS - program_options - system -) -if(UNIX AND EXISTS "/usr/lib64") - list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix -endif(UNIX AND EXISTS "/usr/lib64") -set(Boost_ADDITIONAL_VERSIONS - "1.35.0" "1.35" "1.36.0" "1.36" "1.37.0" "1.37" "1.38.0" "1.38" "1.39.0" "1.39" - "1.40.0" "1.40" "1.41.0" "1.41" "1.42.0" "1.42" "1.43.0" "1.43" "1.44.0" "1.44" - "1.45.0" "1.45" "1.46.0" "1.46" "1.47.0" "1.47" "1.48.0" "1.48" "1.49.0" "1.49" - "1.50.0" "1.50" "1.51.0" "1.51" "1.52.0" "1.52" "1.53.0" "1.53" "1.54.0" "1.54" - "1.55.0" "1.55" "1.56.0" "1.56" "1.57.0" "1.57" "1.58.0" "1.58" "1.59.0" "1.59" - "1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64" - "1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69" -) -find_package(Boost "1.35" COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) - if(NOT Boost_FOUND) message(FATAL_ERROR "Boost required to compile srsENB") endif() -######################################################################## -# Find dependencies -######################################################################## -find_package(Threads REQUIRED) - - ######################################################################## # Setup the include and linker paths ######################################################################## diff --git a/srsue/CMakeLists.txt b/srsue/CMakeLists.txt index b4f58b25a..6d257cde0 100644 --- a/srsue/CMakeLists.txt +++ b/srsue/CMakeLists.txt @@ -18,38 +18,13 @@ # and at http://www.gnu.org/licenses/. # - ######################################################################## -# Find boost +# Boost is required ######################################################################## -set(BOOST_REQUIRED_COMPONENTS - program_options - system -) -if(UNIX AND EXISTS "/usr/lib64") - list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix -endif(UNIX AND EXISTS "/usr/lib64") -set(Boost_ADDITIONAL_VERSIONS - "1.35.0" "1.35" "1.36.0" "1.36" "1.37.0" "1.37" "1.38.0" "1.38" "1.39.0" "1.39" - "1.40.0" "1.40" "1.41.0" "1.41" "1.42.0" "1.42" "1.43.0" "1.43" "1.44.0" "1.44" - "1.45.0" "1.45" "1.46.0" "1.46" "1.47.0" "1.47" "1.48.0" "1.48" "1.49.0" "1.49" - "1.50.0" "1.50" "1.51.0" "1.51" "1.52.0" "1.52" "1.53.0" "1.53" "1.54.0" "1.54" - "1.55.0" "1.55" "1.56.0" "1.56" "1.57.0" "1.57" "1.58.0" "1.58" "1.59.0" "1.59" - "1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64" - "1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69" -) -find_package(Boost "1.35" COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) - if(NOT Boost_FOUND) - message(FATAL_ERROR "Boost required to compile srsUE") + message(FATAL_ERROR "Boost required to compile srsUE and ") endif() -######################################################################## -# Find dependencies -######################################################################## -find_package(Threads REQUIRED) - - ######################################################################## # Setup the include and linker paths ########################################################################