From 54de93bdd945d23bb06f516f6a4cf573b5da6cec Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 1 May 2020 22:02:47 +0200 Subject: [PATCH] Fix for disappearing branch / version in Armadillo --- CMakeLists.txt | 2 +- README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 947b3fb40..3e39130dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -295,7 +295,7 @@ set(GNSSSDR_PROTOBUF_MIN_VERSION "3.0.0") ################################################################################ set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2") set(GNSSSDR_GLOG_LOCAL_VERSION "0.4.0") -set(GNSSSDR_ARMADILLO_LOCAL_VERSION "9.860.x") +set(GNSSSDR_ARMADILLO_LOCAL_VERSION "9.900.x") set(GNSSSDR_GTEST_LOCAL_VERSION "1.10.0") set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master") set(GNSSSDR_GPSTK_LOCAL_VERSION "3.0.0") diff --git a/README.md b/README.md index 8a59c953c..e4fd71c5b 100644 --- a/README.md +++ b/README.md @@ -289,9 +289,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-9.860.2.tar.xz -$ tar xvfz armadillo-9.860.2.tar.xz -$ cd armadillo-9.860.2 +$ wget https://sourceforge.net/projects/arma/files/armadillo-9.870.2.tar.xz +$ tar xvfz armadillo-9.870.2.tar.xz +$ cd armadillo-9.870.2 $ cmake . $ make $ sudo make install