mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-11-06 01:56:25 +00:00
Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next
This commit is contained in:
commit
b1d355fa22
@ -829,10 +829,18 @@ if(NOT VOLK_FOUND)
|
||||
endif()
|
||||
set_package_properties(VOLK PROPERTIES
|
||||
URL "http://libvolk.org"
|
||||
DESCRIPTION "Vector-Optimized Library of Kernels (found: ${VOLK_VERSION})"
|
||||
PURPOSE "Provides an abstraction of optimized math routines targeting several SIMD processors."
|
||||
TYPE REQUIRED
|
||||
)
|
||||
if(VOLK_VERSION)
|
||||
set_package_properties(VOLK PROPERTIES
|
||||
DESCRIPTION "Vector-Optimized Library of Kernels (found: ${VOLK_VERSION})"
|
||||
)
|
||||
else()
|
||||
set_package_properties(VOLK PROPERTIES
|
||||
DESCRIPTION "Vector-Optimized Library of Kernels"
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
|
||||
@ -889,7 +897,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
||||
endif()
|
||||
message(FATAL_ERROR "six - python 2 and 3 compatibility library required to build VOLK_GNSSSDR")
|
||||
endif()
|
||||
|
||||
if(CMAKE_VERSION VERSION_GREATER 3.12)
|
||||
set_package_properties(Python3 PROPERTIES
|
||||
URL "https://www.python.org/"
|
||||
PURPOSE "Required to build volk_gnsssdr."
|
||||
@ -902,6 +910,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
||||
else()
|
||||
set_package_properties(Python3 PROPERTIES
|
||||
DESCRIPTION "An interpreted, high-level, general-purpose programming language"
|
||||
PURPOSE "Another Python version will be used."
|
||||
)
|
||||
endif()
|
||||
if(Python2_FOUND)
|
||||
@ -912,6 +921,7 @@ if(NOT VOLKGNSSSDR_FOUND)
|
||||
TYPE REQUIRED
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(PYTHONINTERP_FOUND)
|
||||
set_package_properties(PythonInterp PROPERTIES
|
||||
|
Loading…
Reference in New Issue
Block a user