mirrors
/
gnss-sdr
mirror of https://github.com/gnss-sdr/gnss-sdr
1
0
Fork 0
Code Issues Releases Wiki Activity

Update Protocol Buffers local version to 3.11.1. Update Armadillo version in README to 9.800.3

This commit is contained in:
Carles Fernandez 2019-12-05 17:00:25 +01:00
parent a9c400355b
commit 5a38a55419
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -410,7 +410,7 @@ set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
set(GNSSSDR_GPSTK_LOCAL_VERSION "2.12")
set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.17")
set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.10")
set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.11.0")
set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.11.1")
if(CMAKE_VERSION VERSION_LESS "3.0.2")
set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.1") # Fix for CentOS 7

12
README.md
View File

@ -222,9 +222,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 zypper install lapack-devel blas-devel # For OpenSUSE
$ sudo pacman -S blas lapack # For Arch Linux
$ wget https://sourceforge.net/projects/arma/files/armadillo-9.800.2.tar.xz
$ tar xvfz armadillo-9.800.2.tar.xz
$ cd armadillo-9.800.2
$ wget https://sourceforge.net/projects/arma/files/armadillo-9.800.3.tar.xz
$ tar xvfz armadillo-9.800.3.tar.xz
$ cd armadillo-9.800.3
$ cmake .
$ make
$ sudo make install
@ -304,9 +304,9 @@ $ sudo apt-get install autoconf automake libtool curl make g++ unzip
and then:
~~~~~~
$ wget https://github.com/protocolbuffers/protobuf/releases/download/v3.11.0/protobuf-cpp-3.11.0.tar.gz
$ tar xvfz protobuf-cpp-3.11.0.tar.gz
$ cd protobuf-3.11.0
$ wget https://github.com/protocolbuffers/protobuf/releases/download/v3.11.1/protobuf-cpp-3.11.1.tar.gz
$ tar xvfz protobuf-cpp-3.11.1.tar.gz
$ cd protobuf-3.11.1
$ ./autogen.sh
$ ./configure
$ make