From fd960398d8b24a5075448fa832cc0e4186a40eb2 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 22 Apr 2022 11:02:16 +0200 Subject: [PATCH] Update local version of Protocol Buffers to 3.20.1 and Armadillo to 11.0.1 --- CMakeLists.txt | 4 ++-- README.md | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1299f03de..8289159cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -321,7 +321,7 @@ set(GNSSSDR_PROTOBUF_MIN_VERSION "3.0.0") ################################################################################ set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2") set(GNSSSDR_GLOG_LOCAL_VERSION "0.6.0") -set(GNSSSDR_ARMADILLO_LOCAL_VERSION "10.8.x") +set(GNSSSDR_ARMADILLO_LOCAL_VERSION "11.0.x") if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)) set(GNSSSDR_GTEST_LOCAL_VERSION "1.10.x") @@ -332,7 +332,7 @@ set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master") set(GNSSSDR_GPSTK_LOCAL_VERSION "8.0.0") set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.23") set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.12") -set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.20.0") +set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.20.1") set(GNSSSDR_BENCHMARK_LOCAL_VERSION "1.6.1") set(GNSSSDR_MATHJAX_EXTERNAL_VERSION "2.7.7") diff --git a/README.md b/README.md index a43d573bf..eb3d62fff 100644 --- a/README.md +++ b/README.md @@ -381,9 +381,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-10.8.0.tar.xz -$ tar xvfz armadillo-10.8.0.tar.xz -$ cd armadillo-10.8.0 +$ wget https://sourceforge.net/projects/arma/files/armadillo-11.0.1.tar.xz +$ tar xvfz armadillo-11.0.1.tar.xz +$ cd armadillo-11.0.1 $ cmake . $ make $ sudo make install @@ -496,9 +496,9 @@ $ sudo apt-get install autoconf automake libtool curl make g++ unzip and then: ``` -$ wget https://github.com/protocolbuffers/protobuf/releases/download/v3.20.0/protobuf-cpp-3.20.0.tar.gz -$ tar xvfz protobuf-cpp-3.20.0.tar.gz -$ cd protobuf-3.20.0 +$ wget https://github.com/protocolbuffers/protobuf/releases/download/v3.20.1/protobuf-cpp-3.20.1.tar.gz +$ tar xvfz protobuf-cpp-3.20.1.tar.gz +$ cd protobuf-3.20.1 $ ./autogen.sh $ ./configure $ make