mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-11-09 03:20:01 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Carles Fernandez 2019-06-19 11:59:55 +02:00
commit 2986423f72
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -890,15 +890,20 @@ if(NOT VOLKGNSSSDR_FOUND)
message(FATAL_ERROR "six - python 2 and 3 compatibility library required to build VOLK_GNSSSDR") message(FATAL_ERROR "six - python 2 and 3 compatibility library required to build VOLK_GNSSSDR")
endif() endif()
if(Python3_FOUND)
set_package_properties(Python3 PROPERTIES set_package_properties(Python3 PROPERTIES
URL "https://www.python.org/" URL "https://www.python.org/"
DESCRIPTION "An interpreted, high-level, general-purpose programming language (found: ${Python3_VERSION})"
PURPOSE "Required to build volk_gnsssdr." PURPOSE "Required to build volk_gnsssdr."
TYPE REQUIRED TYPE REQUIRED
) )
if(Python3_FOUND)
set_package_properties(Python3 PROPERTIES
DESCRIPTION "An interpreted, high-level, general-purpose programming language (found: ${Python3_VERSION})"
)
else()
set_package_properties(Python3 PROPERTIES
DESCRIPTION "An interpreted, high-level, general-purpose programming language"
)
endif() endif()
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/"

1
cmake/Modules/FindGFLAGS.cmake
View File

@ -120,6 +120,7 @@ if(GFLAGS_FOUND)
if(PACKAGE_VERSION) if(PACKAGE_VERSION)
set(GFLAGS_VERSION ${PACKAGE_VERSION}) set(GFLAGS_VERSION ${PACKAGE_VERSION})
endif() endif()
unset(PACKAGE_VERSION)
endif() endif()
if(GFLAGS_FOUND AND NOT TARGET Gflags::gflags) if(GFLAGS_FOUND AND NOT TARGET Gflags::gflags)

1
cmake/Modules/FindGNURADIO.cmake
View File

@ -193,6 +193,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)
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

1
cmake/Modules/FindUHD.cmake
View File

@ -89,6 +89,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)
endif() endif()
if(UHD_FOUND AND NOT TARGET Uhd::uhd) if(UHD_FOUND AND NOT TARGET Uhd::uhd)

1
cmake/Modules/FindVOLK.cmake
View File

@ -92,6 +92,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)
endif() endif()
mark_as_advanced(VOLK_LIBRARIES VOLK_INCLUDE_DIRS VOLK_VERSION) mark_as_advanced(VOLK_LIBRARIES VOLK_INCLUDE_DIRS VOLK_VERSION)