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

Update Armadillo and Protocol Buffers local versions

This commit is contained in:
Carles Fernandez 2021-05-22 00:56:26 +02:00
parent 42be9f1a35
commit 786feddd13
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -323,14 +323,14 @@ set(GNSSSDR_PROTOBUF_MIN_VERSION "3.0.0")
################################################################################
set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2")
set(GNSSSDR_GLOG_LOCAL_VERSION "0.5.0")
set(GNSSSDR_ARMADILLO_LOCAL_VERSION "10.4.x")
set(GNSSSDR_ARMADILLO_LOCAL_VERSION "10.5.x")
set(GNSSSDR_GTEST_LOCAL_VERSION "1.10.x")
set(GNSSSDR_GTEST_LOCAL_VERSION_POST_CMAKE_3_19 "f5e592d8ee5ffb1d9af5be7f715ce3576b8bf9c4") # Used with CMake >= 3.19
set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
set(GNSSSDR_GPSTK_LOCAL_VERSION "8.0.0")
set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.21")
set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.11.4")
set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.16.0")
set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.17.0")
set(GNSSSDR_BENCHMARK_LOCAL_VERSION "1.5.3")
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 zypper install lapack-devel blas-devel # For OpenSUSE
$ sudo pacman -S blas lapack # For Arch Linux
$ wget http://sourceforge.net/projects/arma/files/armadillo-10.4.0.tar.xz
$ tar xvfz armadillo-10.4.0.tar.xz
$ cd armadillo-10.4.0
$ wget http://sourceforge.net/projects/arma/files/armadillo-10.5.0.tar.xz
$ tar xvfz armadillo-10.5.0.tar.xz
$ cd armadillo-10.5.0
$ cmake .
$ make
$ sudo make install
@ -395,9 +395,9 @@ $ sudo apt-get install autoconf automake libtool curl make g++ unzip
and then:
```
$ wget https://github.com/protocolbuffers/protobuf/releases/download/v3.16.0/protobuf-cpp-3.16.0.tar.gz
$ tar xvfz protobuf-cpp-3.16.0.tar.gz
$ cd protobuf-3.16.0
$ wget https://github.com/protocolbuffers/protobuf/releases/download/v3.17.0/protobuf-cpp-3.17.0.tar.gz
$ tar xvfz protobuf-cpp-3.17.0.tar.gz
$ cd protobuf-3.17.0
$ ./autogen.sh
$ ./configure
$ make