From 4fe8c078ea74e1ee163fb4394f619c11e4309199 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Mon, 2 Sep 2019 20:17:46 +0200 Subject: [PATCH] Bump local version of Armadillo to be downloaded and built if not found --- CMakeLists.txt | 2 +- README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec72710a5..deb3a7ff9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -400,7 +400,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.600.x") +set(GNSSSDR_ARMADILLO_LOCAL_VERSION "9.700.x") set(GNSSSDR_GTEST_LOCAL_VERSION "1.8.1") set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master") set(GNSSSDR_GPSTK_LOCAL_VERSION "2.12") diff --git a/README.md b/README.md index b436dfe9b..6929e828d 100644 --- a/README.md +++ b/README.md @@ -220,9 +220,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 http://sourceforge.net/projects/arma/files/armadillo-9.600.4.tar.xz -$ tar xvfz armadillo-9.600.4.tar.xz -$ cd armadillo-9.600.4 +$ wget http://sourceforge.net/projects/arma/files/armadillo-9.700.2.tar.xz +$ tar xvfz armadillo-9.700.2.tar.xz +$ cd armadillo-9.700.2 $ cmake . $ make $ sudo make install