From 619c7aeed3671cfb738ad4a798db81453287a1e8 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 29 Jun 2024 15:33:39 +0200 Subject: [PATCH] Bump local Armadillo version to 14.0.x and Protocol Buffers to 27.2 --- CMakeLists.txt | 4 ++-- README.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f172666e2..5801ced89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -347,11 +347,11 @@ set(GNSSSDR_ABSEIL_MIN_VERSION "20240116") ################################################################################ # Versions to download and build (but not to install system-wide) if not found ################################################################################ -set(GNSSSDR_ARMADILLO_LOCAL_VERSION "12.8.x") +set(GNSSSDR_ARMADILLO_LOCAL_VERSION "14.0.x") set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2") set(GNSSSDR_GLOG_LOCAL_VERSION "0.7.1") set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.27") -set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "27.1") +set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "27.2") set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.14") set(GNSSSDR_GTEST_LOCAL_VERSION "1.14.0") set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "origin/master") diff --git a/README.md b/README.md index a904764b0..85fb1720e 100644 --- a/README.md +++ b/README.md @@ -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 zypper install lapack-devel blas-devel # For OpenSUSE $ sudo pacman -S blas lapack # For Arch Linux -$ wget https://sourceforge.net/projects/arma/files/armadillo-12.8.1.tar.xz -$ tar xvfz armadillo-12.8.1.tar.xz -$ cd armadillo-12.8.1 +$ wget https://sourceforge.net/projects/arma/files/armadillo-14.0.0.tar.xz +$ tar xvfz armadillo-14.0.0.tar.xz +$ cd armadillo-14.0.0 $ cmake . $ make $ sudo make install