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

Update Armadillo and Protocol Buffers local versions

Browse Source
This commit is contained in:
Carles Fernandez 2021-03-13 22:30:23 +01:00
parent 8c69bd9a63
commit 60a7a6d51d
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -324,13 +324,13 @@ set(GNSSSDR_PROTOBUF_MIN_VERSION "3.0.0")
################################################################################ ################################################################################
set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2") set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2")
set(GNSSSDR_GLOG_LOCAL_VERSION "0.4.0") set(GNSSSDR_GLOG_LOCAL_VERSION "0.4.0")
set(GNSSSDR_ARMADILLO_LOCAL_VERSION "10.2.x") set(GNSSSDR_ARMADILLO_LOCAL_VERSION "10.3.x")
set(GNSSSDR_GTEST_LOCAL_VERSION "1.10.0") set(GNSSSDR_GTEST_LOCAL_VERSION "1.10.0")
set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master") set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
set(GNSSSDR_GPSTK_LOCAL_VERSION "8.0.0") set(GNSSSDR_GPSTK_LOCAL_VERSION "8.0.0")
set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.19") set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.19")
set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.11.4") set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.11.4")
set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.15.5") set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.15.6")
set(GNSSSDR_BENCHMARK_LOCAL_VERSION "1.5.2") set(GNSSSDR_BENCHMARK_LOCAL_VERSION "1.5.2")
set(GNSSSDR_MATHJAX_EXTERNAL_VERSION "2.7.7") set(GNSSSDR_MATHJAX_EXTERNAL_VERSION "2.7.7")

12
README.md
View File

@ -292,9 +292,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 http://sourceforge.net/projects/arma/files/armadillo-10.2.1.tar.xz $ wget http://sourceforge.net/projects/arma/files/armadillo-10.3.0.tar.xz
$ tar xvfz armadillo-10.2.1.tar.xz $ tar xvfz armadillo-10.3.0.tar.xz
$ cd armadillo-10.2.1 $ cd armadillo-10.3.0
$ cmake . $ cmake .
$ make $ make
$ sudo make install $ sudo make install
@ -395,9 +395,9 @@ $ sudo apt-get install autoconf automake libtool curl make g++ unzip
and then: and then:
``` ```
$ wget https://github.com/protocolbuffers/protobuf/releases/download/v3.15.5/protobuf-cpp-3.15.5.tar.gz $ wget https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protobuf-cpp-3.15.6.tar.gz
$ tar xvfz protobuf-cpp-3.15.5.tar.gz $ tar xvfz protobuf-cpp-3.15.6.tar.gz
$ cd protobuf-3.15.5 $ cd protobuf-3.15.6
$ ./autogen.sh $ ./autogen.sh
$ ./configure $ ./configure
$ make $ make

3
docs/changelog.md
View File

@ -64,6 +64,9 @@ SPDX-FileCopyrightText: 2011-2021 Carles Fernandez-Prades <carles.fernandez@cttc
`carrier_phase_rads` parameter value. `carrier_phase_rads` parameter value.
- The `Labsat_Signal_Source` implementation of the `SignalSource` block now can - The `Labsat_Signal_Source` implementation of the `SignalSource` block now can
read files in the LabSat 3 Wideband format (`.LS3W`). read files in the LabSat 3 Wideband format (`.LS3W`).
- Replace `Receiver.sources_count` configuration parameter name by
`GNSS-SDR.num_sources`. The former parameter name is still read to ensure
backward compatibility with configuration files using that nomenclature.
&nbsp; &nbsp;