From b527850bdb654642b171eda19fbad895e8fed2c0 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 6 Dec 2025 09:17:53 +0100 Subject: [PATCH] Update local Protocol Buffers to v33.2 and Armadillo to the 15.2.x branch --- CMakeLists.txt | 6 ++---- README.md | 18 +++++++++--------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e13aa64f5..197ce8232 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -355,11 +355,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 "15.0.x") +set(GNSSSDR_ARMADILLO_LOCAL_VERSION "15.2.x") set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.3.0") set(GNSSSDR_GLOG_LOCAL_VERSION "0.7.1") set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.29") -set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "32.1") +set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "33.2") set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.15") set(GNSSSDR_GTEST_LOCAL_VERSION "1.17.0") set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "origin/master") @@ -383,7 +383,6 @@ endif() if(CMAKE_VERSION VERSION_LESS "3.16") set(GNSSSDR_GLOG_LOCAL_VERSION "0.5.0") endif() - if(CMAKE_VERSION VERSION_LESS "3.3") set(GNSSSDR_GLOG_LOCAL_VERSION "0.4.0") endif() @@ -421,7 +420,6 @@ if(CMAKE_VERSION VERSION_LESS "3.13" OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)) set(GNSSSDR_GTEST_LOCAL_VERSION "1.13.0") endif() - 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) OR CMAKE_VERSION VERSION_LESS 3.5) diff --git a/README.md b/README.md index 0914312a0..4cace4bcd 100644 --- a/README.md +++ b/README.md @@ -298,9 +298,9 @@ $ sudo apt install libblas-dev liblapack-dev # For Debian/Ubuntu/LinuxMint $ sudo yum install lapack-devel blas-devel # For Fedora/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-15.0.1.tar.xz -$ tar xvfz armadillo-15.0.1.tar.xz -$ cd armadillo-15.0.1 +$ wget https://sourceforge.net/projects/arma/files/armadillo-15.2.2.tar.xz +$ tar xvfz armadillo-15.2.2.tar.xz +$ cd armadillo-15.2.2 $ cmake . $ make $ sudo make install @@ -316,12 +316,12 @@ BLAS, LAPACK, and ATLAS). #### Install [Gflags](https://github.com/gflags/gflags "Gflags' Homepage"), a commandline flags processing module for C++ ``` -$ wget https://github.com/gflags/gflags/archive/v2.2.2.tar.gz -$ tar xvfz v2.2.2.tar.gz -$ cd gflags-2.2.2 -$ cmake -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF -DBUILD_gflags_nothreads_LIB=OFF . -$ make -$ sudo make install +$ wget https://github.com/gflags/gflags/archive/v2.3.0.tar.gz +$ tar xvfz v2.3.0.tar.gz +$ cd gflags-2.3.0 +$ cmake -S . -B building -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF +$ cmake --build building +$ sudo cmake --install building $ sudo ldconfig ```