mirror of https://github.com/gnss-sdr/gnss-sdr
Move VOLK detection before GNU Radio's.
Update local version of Protocol Buffers to 3.19.0
This commit is contained in:
parent
2f7263d7a3
commit
c0cc458b7d
|
@ -332,7 +332,7 @@ set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
|
||||||
set(GNSSSDR_GPSTK_LOCAL_VERSION "8.0.0")
|
set(GNSSSDR_GPSTK_LOCAL_VERSION "8.0.0")
|
||||||
set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.21")
|
set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.21")
|
||||||
set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.11.4")
|
set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.11.4")
|
||||||
set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.18.0")
|
set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.19.0")
|
||||||
set(GNSSSDR_BENCHMARK_LOCAL_VERSION "1.5.6")
|
set(GNSSSDR_BENCHMARK_LOCAL_VERSION "1.5.6")
|
||||||
set(GNSSSDR_MATHJAX_EXTERNAL_VERSION "2.7.7")
|
set(GNSSSDR_MATHJAX_EXTERNAL_VERSION "2.7.7")
|
||||||
|
|
||||||
|
@ -563,11 +563,24 @@ endif()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
################################################################################
|
||||||
|
# VOLK - Vector-Optimized Library of Kernels
|
||||||
|
################################################################################
|
||||||
|
find_package(VOLK)
|
||||||
|
if(NOT VOLK_FOUND)
|
||||||
|
message(FATAL_ERROR "*** VOLK is required to build gnss-sdr")
|
||||||
|
endif()
|
||||||
|
set_package_properties(VOLK PROPERTIES
|
||||||
|
PURPOSE "Provides an abstraction of optimized math routines targeting several SIMD processors."
|
||||||
|
TYPE REQUIRED
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# GNU Radio - https://www.gnuradio.org
|
# GNU Radio - https://www.gnuradio.org
|
||||||
################################################################################
|
################################################################################
|
||||||
set(GR_REQUIRED_COMPONENTS RUNTIME PMT BLOCKS FFT FILTER ANALOG)
|
set(GR_REQUIRED_COMPONENTS RUNTIME PMT BLOCKS FFT FILTER ANALOG)
|
||||||
|
|
||||||
find_package(UHD)
|
find_package(UHD)
|
||||||
set_package_properties(UHD PROPERTIES
|
set_package_properties(UHD PROPERTIES
|
||||||
PURPOSE "Used for communication with front-ends of the USRP family."
|
PURPOSE "Used for communication with front-ends of the USRP family."
|
||||||
|
@ -974,20 +987,6 @@ endif()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# VOLK - Vector-Optimized Library of Kernels
|
|
||||||
################################################################################
|
|
||||||
find_package(VOLK)
|
|
||||||
if(NOT VOLK_FOUND)
|
|
||||||
message(FATAL_ERROR "*** VOLK is required to build gnss-sdr")
|
|
||||||
endif()
|
|
||||||
set_package_properties(VOLK PROPERTIES
|
|
||||||
PURPOSE "Provides an abstraction of optimized math routines targeting several SIMD processors."
|
|
||||||
TYPE REQUIRED
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# volk_gnsssdr module - GNSS-SDR's own VOLK library
|
# volk_gnsssdr module - GNSS-SDR's own VOLK library
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
Loading…
Reference in New Issue