mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-05-06 01:14:10 +00:00
Code Issues Releases Wiki Activity

Merge branch 'carlesfernandez:next' into osnma-cesare

Browse Source
This commit is contained in:
cesaaargm 2024-03-07 10:20:38 +01:00 committed by GitHub
commit 672f7b3097
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/volk_gnsssdr_archs.yml vendored
View File

@ -45,7 +45,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: uraimo/run-on-arch-action@v2.7.2 - uses: uraimo/run-on-arch-action@v2.7.1
name: Build in non-x86 container name: Build in non-x86 container
# continue-on-error: ${{ contains(fromJson('["ppc64le", "s390x"]'), matrix.arch) }} # continue-on-error: ${{ contains(fromJson('["ppc64le", "s390x"]'), matrix.arch) }}
id: build id: build

6
CMakeLists.txt
View File

@ -335,7 +335,7 @@ set(GNSSSDR_PYTHON3_MIN_VERSION "3.4")
################################################################################ ################################################################################
# Versions to download and build (but not to install system-wide) if not found # Versions to download and build (but not to install system-wide) if not found
################################################################################ ################################################################################
set(GNSSSDR_ARMADILLO_LOCAL_VERSION "12.6.x") set(GNSSSDR_ARMADILLO_LOCAL_VERSION "12.8.x")
set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2") set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2")
set(GNSSSDR_GLOG_LOCAL_VERSION "0.7.0") set(GNSSSDR_GLOG_LOCAL_VERSION "0.7.0")
set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.26") set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.26")
@ -3485,7 +3485,7 @@ message(STATUS "* SUMMARY REPORT *")
message(STATUS "***************************************") message(STATUS "***************************************")
message(STATUS "") message(STATUS "")
if(CMAKE_CROSSCOMPILING) if(CMAKE_CROSSCOMPILING)
message(STATUS "Cross-compiling on ${LINUX_DISTRIBUTION} ${LINUX_VER} (${CMAKE_HOST_SYSTEM_PROCESSOR}) for ${CMAKE_SYSTEM_PROCESSOR} ${ARCHITECTURE_STRING}") message(STATUS "Cross-compiling on ${LINUX_DISTRIBUTION} ${LINUX_VER} (${CMAKE_HOST_SYSTEM_PROCESSOR}) for ${CMAKE_SYSTEM_PROCESSOR}")
else() else()
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|kFreeBSD|GNU") if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|kFreeBSD|GNU")
message(STATUS "Building on GNU/Linux ${LINUX_DISTRIBUTION} ${LINUX_VER} ${ARCHITECTURE_STRING}") message(STATUS "Building on GNU/Linux ${LINUX_DISTRIBUTION} ${LINUX_VER} ${ARCHITECTURE_STRING}")
@ -3508,7 +3508,7 @@ file(APPEND ${GNSSSDR_BINARY_DIR}/features.log "********************************
file(APPEND ${GNSSSDR_BINARY_DIR}/features.log "GNSS-SDR version: ${VERSION}\n") file(APPEND ${GNSSSDR_BINARY_DIR}/features.log "GNSS-SDR version: ${VERSION}\n")
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|kFreeBSD|GNU") if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|kFreeBSD|GNU")
if(CMAKE_CROSSCOMPILING) if(CMAKE_CROSSCOMPILING)
file(APPEND ${GNSSSDR_BINARY_DIR}/features.log "Cross-compiling on ${LINUX_DISTRIBUTION} ${LINUX_VER} (${CMAKE_HOST_SYSTEM_PROCESSOR}) for ${CMAKE_SYSTEM_PROCESSOR} ${ARCHITECTURE_STRING}\n") file(APPEND ${GNSSSDR_BINARY_DIR}/features.log "Cross-compiling on ${LINUX_DISTRIBUTION} ${LINUX_VER} (${CMAKE_HOST_SYSTEM_PROCESSOR}) for ${CMAKE_SYSTEM_PROCESSOR}\n")
else() else()
file(APPEND ${GNSSSDR_BINARY_DIR}/features.log "Building on GNU/Linux ${LINUX_DISTRIBUTION} ${LINUX_VER} ${ARCHITECTURE_STRING}\n") file(APPEND ${GNSSSDR_BINARY_DIR}/features.log "Building on GNU/Linux ${LINUX_DISTRIBUTION} ${LINUX_VER} ${ARCHITECTURE_STRING}\n")
endif() endif()

34
README.md
View File

@ -403,9 +403,9 @@ $ sudo apt-get install libblas-dev liblapack-dev # For Debian/Ubuntu/Linux
$ sudo yum install lapack-devel blas-devel # For Fedora/CentOS/RHEL $ sudo yum install lapack-devel blas-devel # For Fedora/CentOS/RHEL
$ sudo zypper install lapack-devel blas-devel # For OpenSUSE $ sudo zypper install lapack-devel blas-devel # For OpenSUSE
$ sudo pacman -S blas lapack # For Arch Linux $ sudo pacman -S blas lapack # For Arch Linux
$ wget https://sourceforge.net/projects/arma/files/armadillo-12.0.1.tar.xz $ wget https://sourceforge.net/projects/arma/files/armadillo-12.8.1.tar.xz
$ tar xvfz armadillo-12.0.1.tar.xz $ tar xvfz armadillo-12.8.1.tar.xz
$ cd armadillo-12.0.1 $ cd armadillo-12.8.1
$ cmake . $ cmake .
$ make $ make
$ sudo make install $ sudo make install
@ -433,9 +433,9 @@ $ sudo ldconfig
#### Install [Glog](https://github.com/google/glog "Glog's Homepage"), a library that implements application-level logging #### Install [Glog](https://github.com/google/glog "Glog's Homepage"), a library that implements application-level logging
``` ```
$ wget https://github.com/google/glog/archive/v0.6.0.tar.gz $ wget https://github.com/google/glog/archive/v0.7.0.tar.gz
$ tar xvfz v0.6.0.tar.gz $ tar xvfz v0.7.0.tar.gz
$ cd glog-0.6.0 $ cd glog-0.7.0
$ mkdir build && cd build $ mkdir build && cd build
$ cmake .. $ cmake ..
$ make $ make
@ -460,9 +460,9 @@ GNSS-SDR can also work well with
#### Install [Matio](https://github.com/tbeu/matio "Matio's Homepage"), MATLAB MAT file I/O library #### Install [Matio](https://github.com/tbeu/matio "Matio's Homepage"), MATLAB MAT file I/O library
``` ```
$ wget https://github.com/tbeu/matio/releases/download/v1.5.23/matio-1.5.23.tar.gz $ wget https://github.com/tbeu/matio/releases/download/v1.5.26/matio-1.5.26.tar.gz
$ tar xvfz matio-1.5.23.tar.gz $ tar xvfz matio-1.5.26.tar.gz
$ cd matio-1.5.23 $ cd matio-1.5.26
$ ./configure $ ./configure
$ make $ make
$ sudo make install $ sudo make install
@ -489,9 +489,9 @@ For more options, please check the
#### Install [Pugixml](https://pugixml.org/ "Pugixml's Homepage"), a light-weight C++ XML processing library #### Install [Pugixml](https://pugixml.org/ "Pugixml's Homepage"), a light-weight C++ XML processing library
``` ```
$ wget https://github.com/zeux/pugixml/releases/download/v1.13/pugixml-1.13.tar.gz $ wget https://github.com/zeux/pugixml/releases/download/v1.14/pugixml-1.14.tar.gz
$ tar xvfz pugixml-1.13.tar.gz $ tar xvfz pugixml-1.14.tar.gz
$ cd pugixml-1.13 $ cd pugixml-1.14
$ mkdir build && cd build $ mkdir build && cd build
$ cmake .. $ cmake ..
$ make $ make
@ -502,8 +502,8 @@ $ sudo ldconfig
#### Download [GoogleTest](https://github.com/google/googletest "Googletest Homepage") #### Download [GoogleTest](https://github.com/google/googletest "Googletest Homepage")
``` ```
$ wget https://github.com/google/googletest/archive/refs/tags/v1.13.0.zip $ wget https://github.com/google/googletest/archive/refs/tags/v1.14.0.zip
$ unzip v1.13.0.zip $ unzip v1.14.0.zip
``` ```
Please **DO NOT build or install** Google Test. Every user needs to compile Please **DO NOT build or install** Google Test. Every user needs to compile
@ -527,10 +527,10 @@ downloaded resides. Just type in your terminal (or add it to your
`$HOME/.bashrc` file for a permanent solution) the following line: `$HOME/.bashrc` file for a permanent solution) the following line:
``` ```
export GTEST_DIR=/home/username/googletest-1.13.0 export GTEST_DIR=/home/username/googletest-1.14.0
``` ```
changing `/home/username/googletest-1.13.0` by the actual path where you changing `/home/username/googletest-1.14.0` by the actual path where you
unpacked Google Test. If the CMake script does not find that folder, or the unpacked Google Test. If the CMake script does not find that folder, or the
environment variable is not defined, or the source code is not installed by a environment variable is not defined, or the source code is not installed by a
package, then it will download a fresh copy of the Google Test source code and package, then it will download a fresh copy of the Google Test source code and
@ -872,7 +872,7 @@ Install the required dependencies:
``` ```
$ brew update && brew upgrade $ brew update && brew upgrade
$ brew install armadillo cmake hdf5 gflags glog gnuradio libmatio log4cpp \ $ brew install armadillo cmake hdf5 gflags glog gnuradio libmatio log4cpp \
openssl pkg-config protobuf pugixml pyhon-mako openssl pkg-config protobuf pugixml python-mako
$ brew install --cask mactex # when completed, restart Terminal $ brew install --cask mactex # when completed, restart Terminal
$ brew install graphviz doxygen $ brew install graphviz doxygen
``` ```

8
cmake/Modules/DetectLinuxDistro.cmake
View File

@ -4,10 +4,14 @@
# SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es # SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(CMAKE_VERSION VERSION_LESS 3.19)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(ARCHITECTURE_STRING "(64 bits)") set(ARCHITECTURE_STRING "(64 bits)")
else() else()
set(ARCHITECTURE_STRING "(32 bits)") set(ARCHITECTURE_STRING "(32 bits)")
endif()
else()
set(ARCHITECTURE_STRING "(${CMAKE_HOST_SYSTEM_PROCESSOR})")
endif() endif()
if(EXISTS "/etc/lsb-release") if(EXISTS "/etc/lsb-release")