From 74b0b4ff1b773d1bc0f72d6fe73f342d5899ba48 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@cttc.es>
Date: Sun, 24 Aug 2025 14:00:20 +0200
Subject: [PATCH] Bump max CMake version to 4.1 and local Armadillo version to
 the 15.0.x branch

---
 CMakeLists.txt                                             | 7 +++++--
 README.md                                                  | 6 +++---
 .../libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt   | 2 +-
 utils/nav-listener/CMakeLists.txt                          | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index efd73c201..9a7b00859 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ endif()
 # Build type can still be overridden by setting -DCMAKE_BUILD_TYPE=
 set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")
 
-cmake_minimum_required(VERSION 2.8.12...4.0)
+cmake_minimum_required(VERSION 2.8.12...4.1)
 project(gnss-sdr CXX C)
 
 set(GNSSSDR_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) # Allows to be a sub-project
@@ -355,7 +355,7 @@ 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 "14.6.x")
+set(GNSSSDR_ARMADILLO_LOCAL_VERSION "15.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.28")
@@ -372,6 +372,9 @@ set(GNSSSDR_ABSL_LOCAL_VERSION "origin/master") # live at head (see https://abse
 if(CMAKE_VERSION VERSION_LESS "3.5")
     set(GNSSSDR_ARMADILLO_LOCAL_VERSION "12.8.x")
 endif()
+if(CMAKE_VERSION VERSION_LESS "3.10")
+    set(GNSSSDR_ARMADILLO_LOCAL_VERSION "14.6.x")
+endif()
 
 if(CMAKE_VERSION VERSION_LESS "3.22")
     set(GNSSSDR_GLOG_LOCAL_VERSION "0.6.0")
diff --git a/README.md b/README.md
index 08ba16502..11b418ed8 100644
--- a/README.md
+++ b/README.md
@@ -295,9 +295,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-14.6.1.tar.xz
-$ tar xvfz armadillo-14.6.1.tar.xz
-$ cd armadillo-14.6.1
+$ 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
 $ cmake .
 $ make
 $ sudo make install
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
index 55810ff43..431238a1e 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
@@ -8,7 +8,7 @@
 ########################################################################
 # Project setup
 ########################################################################
-cmake_minimum_required(VERSION 2.8.12...4.0)
+cmake_minimum_required(VERSION 2.8.12...4.1)
 set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "Choose build type: None Debug Release RelWithDebInfo MinSizeRel")
 project(volk_gnsssdr)
 enable_language(CXX)
diff --git a/utils/nav-listener/CMakeLists.txt b/utils/nav-listener/CMakeLists.txt
index 4b514c0e2..824c8dccf 100644
--- a/utils/nav-listener/CMakeLists.txt
+++ b/utils/nav-listener/CMakeLists.txt
@@ -4,7 +4,7 @@
 # SPDX-FileCopyrightText: 2021 C. Fernandez-Prades cfernandez(at)cttc.es
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required(VERSION 3.9...4.0)
+cmake_minimum_required(VERSION 3.9...4.1)
 project(nav-msg-listener CXX)
 
 set(CMAKE_CXX_STANDARD 11)