mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 12:40:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next

Browse Source
This commit is contained in:
Carles Fernandez 2019-06-27 09:05:41 +02:00
commit a1a75b16c3
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
7 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@ -677,11 +677,11 @@ set_package_properties(Boost PROPERTIES
if(CMAKE_VERSION VERSION_GREATER 3.14) if(CMAKE_VERSION VERSION_GREATER 3.14)
set_package_properties(Boost PROPERTIES set_package_properties(Boost PROPERTIES
DESCRIPTION "Portable C++ source libraries (found: ${Boost_VERSION_STRING})" DESCRIPTION "Portable C++ source libraries (found: v${Boost_VERSION_STRING})"
) )
else() else()
set_package_properties(Boost PROPERTIES set_package_properties(Boost PROPERTIES
DESCRIPTION "Portable C++ source libraries (found: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION})" DESCRIPTION "Portable C++ source libraries (found: v${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION})"
) )
endif() endif()
@ -808,7 +808,7 @@ if(NOT VOLKGNSSSDR_FOUND)
# Mako # Mako
if(NOT MAKO_FOUND) if(NOT MAKO_FOUND)
message(STATUS "Mako template library not found. See http://www.makotemplates.org/ ") message(STATUS "Mako template library not found. See http://www.makotemplates.org/")
message(STATUS " You can try to install it by typing:") message(STATUS " You can try to install it by typing:")
if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat") if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
message(STATUS " sudo yum install ${PYTHON_NAME}-mako") message(STATUS " sudo yum install ${PYTHON_NAME}-mako")
@ -822,7 +822,7 @@ if(NOT VOLKGNSSSDR_FOUND)
# Six # Six
if(NOT SIX_FOUND) if(NOT SIX_FOUND)
message(STATUS "python-six not found. See https://pythonhosted.org/six/ ") message(STATUS "python-six not found. See https://pythonhosted.org/six/")
message(STATUS " You can try to install it by typing:") message(STATUS " You can try to install it by typing:")
if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat") if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
message(STATUS " sudo yum install ${PYTHON_NAME}-six") message(STATUS " sudo yum install ${PYTHON_NAME}-six")
@ -841,7 +841,7 @@ if(NOT VOLKGNSSSDR_FOUND)
) )
if(Python3_FOUND) if(Python3_FOUND)
set_package_properties(Python3 PROPERTIES set_package_properties(Python3 PROPERTIES
DESCRIPTION "An interpreted, high-level, general-purpose programming language (found: ${Python3_VERSION})" DESCRIPTION "An interpreted, high-level, general-purpose programming language (found: v${Python3_VERSION})"
) )
else() else()
set_package_properties(Python3 PROPERTIES set_package_properties(Python3 PROPERTIES
@ -852,7 +852,7 @@ if(NOT VOLKGNSSSDR_FOUND)
if(Python2_FOUND) if(Python2_FOUND)
set_package_properties(Python2 PROPERTIES set_package_properties(Python2 PROPERTIES
URL "https://www.python.org/" URL "https://www.python.org/"
DESCRIPTION "An interpreted, high-level, general-purpose programming language (found: ${Python2_VERSION})" DESCRIPTION "An interpreted, high-level, general-purpose programming language (found: v${Python2_VERSION})"
PURPOSE "Required to build volk_gnsssdr." PURPOSE "Required to build volk_gnsssdr."
TYPE REQUIRED TYPE REQUIRED
) )
@ -862,7 +862,7 @@ if(NOT VOLKGNSSSDR_FOUND)
if(PYTHONINTERP_FOUND) if(PYTHONINTERP_FOUND)
set_package_properties(PythonInterp PROPERTIES set_package_properties(PythonInterp PROPERTIES
URL "https://www.python.org/" URL "https://www.python.org/"
DESCRIPTION "An interpreted, high-level, general-purpose programming language (found: ${PYTHON_VERSION_STRING})" DESCRIPTION "An interpreted, high-level, general-purpose programming language (found: v${PYTHON_VERSION_STRING})"
PURPOSE "Required to build volk_gnsssdr." PURPOSE "Required to build volk_gnsssdr."
TYPE REQUIRED TYPE REQUIRED
) )
@ -1000,7 +1000,7 @@ set_package_properties(GFLAGS PROPERTIES
) )
if(NOT GFLAGS_FOUND) if(NOT GFLAGS_FOUND)
message(STATUS " gflags library has not been found.") message(STATUS " gflags library has not been found.")
message(STATUS " gflags v${GNSSSDR_GFLAGS_LOCAL_VERSION} will be downloaded and built automatically ") message(STATUS " gflags v${GNSSSDR_GFLAGS_LOCAL_VERSION} will be downloaded and built automatically")
message(STATUS " when doing 'make'.") message(STATUS " when doing 'make'.")
if(CMAKE_VERSION VERSION_LESS 3.2) if(CMAKE_VERSION VERSION_LESS 3.2)
@ -1079,7 +1079,7 @@ if(NOT GLOG_FOUND OR ${LOCAL_GFLAGS})
if(NOT GFLAGS_FOUND) if(NOT GFLAGS_FOUND)
message(STATUS " or it is likely not linked to gflags.") message(STATUS " or it is likely not linked to gflags.")
endif() endif()
message(STATUS " glog v${GNSSSDR_GLOG_LOCAL_VERSION} will be downloaded and built automatically ") message(STATUS " glog v${GNSSSDR_GLOG_LOCAL_VERSION} will be downloaded and built automatically")
message(STATUS " when doing 'make'.") message(STATUS " when doing 'make'.")
if(NOT ${LOCAL_GFLAGS}) if(NOT ${LOCAL_GFLAGS})
add_library(gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION} UNKNOWN IMPORTED) add_library(gflags-${GNSSSDR_GFLAGS_LOCAL_VERSION} UNKNOWN IMPORTED)
@ -1529,7 +1529,7 @@ if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERS
) )
if(ZLIB_FOUND AND ZLIB_VERSION_STRING) if(ZLIB_FOUND AND ZLIB_VERSION_STRING)
set_package_properties(ZLIB PROPERTIES set_package_properties(ZLIB PROPERTIES
DESCRIPTION "A Massively Spiffy Yet Delicately Unobtrusive Compression Library (found: ${ZLIB_VERSION_STRING})" DESCRIPTION "A Massively Spiffy Yet Delicately Unobtrusive Compression Library (found: v${ZLIB_VERSION_STRING})"
) )
else() else()
set_package_properties(ZLIB PROPERTIES set_package_properties(ZLIB PROPERTIES
@ -1580,7 +1580,7 @@ if(NOT MATIO_FOUND OR MATIO_VERSION_STRING VERSION_LESS ${GNSSSDR_MATIO_MIN_VERS
) )
if(HDF5_FOUND AND HDF5_VERSION) if(HDF5_FOUND AND HDF5_VERSION)
set_package_properties(HDF5 PROPERTIES set_package_properties(HDF5 PROPERTIES
DESCRIPTION "A versatile data model, a portable file format and a software library (found: ${HDF5_VERSION})" DESCRIPTION "A versatile data model, a portable file format and a software library (found: v${HDF5_VERSION})"
) )
else() else()
set_package_properties(HDF5 PROPERTIES set_package_properties(HDF5 PROPERTIES
@ -2059,7 +2059,7 @@ if(ENABLE_OPENCL)
else() else()
if(OPENCL_FOUND) if(OPENCL_FOUND)
message(STATUS "OpenCL has been found and will be used by some processing blocks") message(STATUS "OpenCL has been found and will be used by some processing blocks")
message(STATUS " You can disable OpenCL use by doing 'cmake -DENABLE_OPENCL=OFF ..' ") message(STATUS " You can disable OpenCL use by doing 'cmake -DENABLE_OPENCL=OFF ..'")
endif() endif()
endif() endif()
if(ENABLE_GENERIC_ARCH) if(ENABLE_GENERIC_ARCH)

4
cmake/Modules/FindGFLAGS.cmake
View File

@ -117,6 +117,8 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(GFLAGS DEFAULT_MSG GFlags_LIBS GFlags_INCLUDE_DIRS) find_package_handle_standard_args(GFLAGS DEFAULT_MSG GFlags_LIBS GFlags_INCLUDE_DIRS)
if(GFLAGS_FOUND) if(GFLAGS_FOUND)
set(OLD_PACKAGE_VERSION ${PACKAGE_VERSION})
unset(PACKAGE_VERSION)
list(GET GFlags_LIBS 0 FIRST_DIR) list(GET GFlags_LIBS 0 FIRST_DIR)
get_filename_component(GFlags_LIBS_DIR ${FIRST_DIR} DIRECTORY) get_filename_component(GFlags_LIBS_DIR ${FIRST_DIR} DIRECTORY)
if(EXISTS ${GFlags_LIBS_DIR}/cmake/gflags/gflags-config-version.cmake) if(EXISTS ${GFlags_LIBS_DIR}/cmake/gflags/gflags-config-version.cmake)
@ -132,7 +134,7 @@ if(GFLAGS_FOUND)
DESCRIPTION "C++ library that implements commandline flags processing" DESCRIPTION "C++ library that implements commandline flags processing"
) )
endif() endif()
unset(PACKAGE_VERSION) set(PACKAGE_VERSION ${OLD_PACKAGE_VERSION})
else() else()
set_package_properties(GFLAGS PROPERTIES set_package_properties(GFLAGS PROPERTIES
DESCRIPTION "C++ library that implements commandline flags processing" DESCRIPTION "C++ library that implements commandline flags processing"

4
cmake/Modules/FindGNURADIO.cmake
View File

@ -187,6 +187,8 @@ list(REMOVE_DUPLICATES GNURADIO_ALL_INCLUDE_DIRS)
list(REMOVE_DUPLICATES GNURADIO_ALL_LIBRARIES) list(REMOVE_DUPLICATES GNURADIO_ALL_LIBRARIES)
if(NOT PC_GNURADIO_RUNTIME_VERSION) if(NOT PC_GNURADIO_RUNTIME_VERSION)
set(OLD_PACKAGE_VERSION ${PACKAGE_VERSION})
unset(PACKAGE_VERSION)
list(GET GNURADIO_BLOCKS_LIBRARIES 0 FIRST_DIR) list(GET GNURADIO_BLOCKS_LIBRARIES 0 FIRST_DIR)
get_filename_component(GNURADIO_BLOCKS_DIR ${FIRST_DIR} DIRECTORY) get_filename_component(GNURADIO_BLOCKS_DIR ${FIRST_DIR} DIRECTORY)
if(EXISTS ${GNURADIO_BLOCKS_DIR}/cmake/gnuradio/GnuradioConfigVersion.cmake) if(EXISTS ${GNURADIO_BLOCKS_DIR}/cmake/gnuradio/GnuradioConfigVersion.cmake)
@ -198,7 +200,7 @@ if(NOT PC_GNURADIO_RUNTIME_VERSION)
if(PACKAGE_VERSION) if(PACKAGE_VERSION)
set(PC_GNURADIO_RUNTIME_VERSION ${PACKAGE_VERSION}) set(PC_GNURADIO_RUNTIME_VERSION ${PACKAGE_VERSION})
endif() endif()
unset(PACKAGE_VERSION) set(PACKAGE_VERSION ${OLD_PACKAGE_VERSION})
endif() endif()
# Trick to find out that GNU Radio is >= 3.7.4 if pkgconfig is not present # Trick to find out that GNU Radio is >= 3.7.4 if pkgconfig is not present

4
cmake/Modules/FindGPSTK.cmake
View File

@ -54,13 +54,15 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(GPSTK DEFAULT_MSG GPSTK_LIBRARY GPSTK_INCLUDE_DIR) find_package_handle_standard_args(GPSTK DEFAULT_MSG GPSTK_LIBRARY GPSTK_INCLUDE_DIR)
if(GPSTK_FOUND) if(GPSTK_FOUND)
set(OLD_PACKAGE_VERSION ${PACKAGE_VERSION})
unset(PACKAGE_VERSION)
if(EXISTS ${CMAKE_INSTALL_FULL_DATADIR}/cmake/GPSTK/GPSTKConfigVersion.cmake) if(EXISTS ${CMAKE_INSTALL_FULL_DATADIR}/cmake/GPSTK/GPSTKConfigVersion.cmake)
include(${CMAKE_INSTALL_FULL_DATADIR}/cmake/GPSTK/GPSTKConfigVersion.cmake) include(${CMAKE_INSTALL_FULL_DATADIR}/cmake/GPSTK/GPSTKConfigVersion.cmake)
endif() endif()
if(PACKAGE_VERSION) if(PACKAGE_VERSION)
set(GPSTK_VERSION ${PACKAGE_VERSION}) set(GPSTK_VERSION ${PACKAGE_VERSION})
endif() endif()
unset(PACKAGE_VERSION) set(PACKAGE_VERSION ${OLD_PACKAGE_VERSION})
endif() endif()
if(GPSTK_FOUND AND GPSTK_VERSION) if(GPSTK_FOUND AND GPSTK_VERSION)

4
cmake/Modules/FindTELEORBIT.cmake
View File

@ -60,6 +60,8 @@ if(PC_TELEORBIT_VERSION)
endif() endif()
if(NOT TELEORBIT_VERSION) if(NOT TELEORBIT_VERSION)
set(OLD_PACKAGE_VERSION ${PACKAGE_VERSION})
unset(PACKAGE_VERSION)
list(GET TELEORBIT_LIBRARIES 0 FIRST_DIR) list(GET TELEORBIT_LIBRARIES 0 FIRST_DIR)
get_filename_component(TELEORBIT_LIBRARIES_DIR ${FIRST_DIR} DIRECTORY) get_filename_component(TELEORBIT_LIBRARIES_DIR ${FIRST_DIR} DIRECTORY)
if(EXISTS ${TELEORBIT_LIBRARIES_DIR}/cmake/teleorbit/TeleorbitConfigVersion.cmake) if(EXISTS ${TELEORBIT_LIBRARIES_DIR}/cmake/teleorbit/TeleorbitConfigVersion.cmake)
@ -68,7 +70,7 @@ if(NOT TELEORBIT_VERSION)
if(PACKAGE_VERSION) if(PACKAGE_VERSION)
set(TELEORBIT_VERSION ${PACKAGE_VERSION}) set(TELEORBIT_VERSION ${PACKAGE_VERSION})
endif() endif()
unset(PACKAGE_VERSION) set(PACKAGE_VERSION ${OLD_PACKAGE_VERSION})
endif() endif()
if(TELEORBIT_FOUND AND TELEORBIT_VERSION) if(TELEORBIT_FOUND AND TELEORBIT_VERSION)

4
cmake/Modules/FindUHD.cmake
View File

@ -86,6 +86,8 @@ if(PC_UHD_VERSION)
set(UHD_VERSION ${PC_UHD_VERSION}) set(UHD_VERSION ${PC_UHD_VERSION})
endif() endif()
if(NOT PC_UHD_VERSION) if(NOT PC_UHD_VERSION)
set(OLD_PACKAGE_VERSION ${PACKAGE_VERSION})
unset(PACKAGE_VERSION)
list(GET UHD_LIBRARIES 0 FIRST_DIR) list(GET UHD_LIBRARIES 0 FIRST_DIR)
get_filename_component(UHD_LIBRARIES_DIR ${FIRST_DIR} DIRECTORY) get_filename_component(UHD_LIBRARIES_DIR ${FIRST_DIR} DIRECTORY)
if(EXISTS ${UHD_LIBRARIES_DIR}/cmake/uhd/UHDConfigVersion.cmake) if(EXISTS ${UHD_LIBRARIES_DIR}/cmake/uhd/UHDConfigVersion.cmake)
@ -94,7 +96,7 @@ if(NOT PC_UHD_VERSION)
if(PACKAGE_VERSION) if(PACKAGE_VERSION)
set(UHD_VERSION ${PACKAGE_VERSION}) set(UHD_VERSION ${PACKAGE_VERSION})
endif() endif()
unset(PACKAGE_VERSION) set(PACKAGE_VERSION ${OLD_PACKAGE_VERSION})
endif() endif()
set_package_properties(UHD PROPERTIES set_package_properties(UHD PROPERTIES

4
cmake/Modules/FindVOLK.cmake
View File

@ -88,6 +88,8 @@ if(PC_VOLK_VERSION)
endif() endif()
if(NOT VOLK_VERSION) if(NOT VOLK_VERSION)
set(OLD_PACKAGE_VERSION ${PACKAGE_VERSION})
unset(PACKAGE_VERSION)
list(GET VOLK_LIBRARIES 0 FIRST_DIR) list(GET VOLK_LIBRARIES 0 FIRST_DIR)
get_filename_component(VOLK_LIB_DIR ${FIRST_DIR} DIRECTORY) get_filename_component(VOLK_LIB_DIR ${FIRST_DIR} DIRECTORY)
if(EXISTS ${VOLK_LIB_DIR}/cmake/volk/VolkConfigVersion.cmake) if(EXISTS ${VOLK_LIB_DIR}/cmake/volk/VolkConfigVersion.cmake)
@ -96,7 +98,7 @@ if(NOT VOLK_VERSION)
if(PACKAGE_VERSION) if(PACKAGE_VERSION)
set(VOLK_VERSION ${PACKAGE_VERSION}) set(VOLK_VERSION ${PACKAGE_VERSION})
endif() endif()
unset(PACKAGE_VERSION) set(PACKAGE_VERSION ${OLD_PACKAGE_VERSION})
endif() endif()
set_package_properties(VOLK PROPERTIES set_package_properties(VOLK PROPERTIES