mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-24 12:07:40 +00:00
Code Issues Releases Wiki Activity

Merging next branch

Browse Source
This commit is contained in:
Javier Arribas
2021-06-21 17:00:27 +02:00
parent 3164a7aa3f ecc339e68b
commit 514bb331ce
59 changed files with 1910 additions and 1689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmake/Modules/DetectMacOSVersion.cmake
View File

@@ -7,10 +7,16 @@
execute_process(COMMAND uname -v OUTPUT_VARIABLE DARWIN_VERSION)
string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
if(${DARWIN_VERSION} MATCHES "20")
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++17")
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
set(MACOS_DISTRIBUTION "macOS Big Sur 11")
if(${DARWIN_VERSION} VERSION_GREATER "19")
execute_process(COMMAND awk "/SOFTWARE LICENSE AGREEMENT FOR macOS/" "/System/Library/CoreServices/Setup Assistant.app/Contents/Resources/en.lproj/OSXSoftwareLicense.rtf" OUTPUT_VARIABLE macOS_NAME)
if(macOS_NAME)
string(REGEX MATCH "macOS*([^\n\r]*)" macOS_NAME ${macOS_NAME})
string(REGEX REPLACE "macOS " "" macOS_NAME ${macOS_NAME})
string(REGEX REPLACE ".$" "" macOS_NAME ${macOS_NAME})
execute_process(COMMAND sw_vers -productVersion OUTPUT_VARIABLE macOS_VERSION)
string(REGEX REPLACE "\n$" "" macOS_VERSION ${macOS_VERSION})
set(MACOS_DISTRIBUTION "macOS ${macOS_NAME} ${macOS_VERSION}")
endif()
endif()
if(${DARWIN_VERSION} MATCHES "19")

2
cmake/Modules/FindGFORTRAN.cmake
View File

@@ -20,7 +20,7 @@ if(DEFINED ENV{GFORTRAN_ROOT})
)
endif()
set(GCC_MAJOR_SERIES 11 10 9 8 7 6 5)
set(GCC_MAJOR_SERIES 12 11 10 9 8 7 6 5)
set(GCC4_SERIES 4.9.1 4.9 4.8.3 4.8.1 4.7.2 4.7 4.8.2 4.8 4.7 4.6 4.5 4.4.4 4.4)
set(GCC_SERIES ${GCC_MAJOR_SERIES} ${GCC4_SERIES})

80
cmake/Modules/FindGRGN3S.cmake
View File

@@ -1,80 +0,0 @@
# GNSS-SDR is a Global Navigation Satellite System software-defined receiver.
# This file is part of GNSS-SDR.
#
# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es
# SPDX-License-Identifier: BSD-3-Clause
########################################################################
# Find GR-GN3S Module
########################################################################
#
# Provides the following imported target:
# Gnuradio::gn3s
#
if(NOT PKG_CONFIG_FOUND)
include(FindPkgConfig)
endif()
pkg_check_modules(PC_GR_GN3S gr-gn3s)
if(NOT GRGN3S_ROOT)
set(GRGN3S_ROOT_USER_DEFINED /usr/local)
else()
set(GRGN3S_ROOT_USER_DEFINED ${GRGN3S_ROOT})
endif()
if(DEFINED ENV{GRGN3S_ROOT})
set(GRGN3S_ROOT_USER_DEFINED
${GRGN3S_ROOT_USER_DEFINED}
$ENV{GRGN3S_ROOT}
)
endif()
if(DEFINED ENV{GR_GN3S_DIR})
set(GRGN3S_ROOT_USER_DEFINED
${GRGN3S_ROOT_USER_DEFINED}
$ENV{GR_GN3S_DIR}
)
endif()
set(GRGN3S_ROOT_USER_DEFINED
${GRGN3S_ROOT_USER_DEFINED}
${CMAKE_INSTALL_PREFIX}
)
find_path(
GR_GN3S_INCLUDE_DIRS
NAMES gn3s/gn3s_api.h
HINTS ${PC_GR_GN3S_INCLUDEDIR}
PATHS ${GRGN3S_ROOT_USER_DEFINED}/include
/usr/include
/usr/local/include
/opt/local/include
)
find_library(
GR_GN3S_LIBRARIES
NAMES gr-gn3s
HINTS ${PC_GR_GN3S_LIBDIR}
PATHS ${GRGN3S_ROOT_USER_DEFINED}/lib
${GRGN3S_ROOT_USER_DEFINED}/lib64
/usr/lib
/usr/lib64
/usr/local/lib
/usr/local/lib64
/opt/local/lib
)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(GRGN3S DEFAULT_MSG GR_GN3S_LIBRARIES GR_GN3S_INCLUDE_DIRS)
if(GRGN3S_FOUND AND NOT TARGET Gnuradio::gn3s)
add_library(Gnuradio::gn3s SHARED IMPORTED)
set_target_properties(Gnuradio::gn3s PROPERTIES
IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
IMPORTED_LOCATION "${GR_GN3S_LIBRARIES}"
INTERFACE_INCLUDE_DIRECTORIES "${GR_GN3S_INCLUDE_DIRS}"
INTERFACE_LINK_LIBRARIES "${GR_GN3S_LIBRARIES}"
)
endif()
mark_as_advanced(GR_GN3S_LIBRARIES GR_GN3S_INCLUDE_DIRS)