From 52aa4290d8f4a0ed82c8d0c801923641e5f49b40 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 22 Mar 2019 13:45:52 +0100 Subject: [PATCH] Update suggested glog and armadillo versions if built manually --- CMakeLists.txt | 2 +- README.md | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 005286a12..356eec9db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -409,7 +409,7 @@ set(GNSSSDR_MATIO_MIN_VERSION "1.5.3") ################################################################################ set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2") set(GNSSSDR_GLOG_LOCAL_VERSION "0.4.0") -set(GNSSSDR_ARMADILLO_LOCAL_VERSION "9.200.x") +set(GNSSSDR_ARMADILLO_LOCAL_VERSION "9.300.x") set(GNSSSDR_GTEST_LOCAL_VERSION "1.8.1") set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master") set(GNSSSDR_GPSTK_LOCAL_VERSION "2.10.6") diff --git a/README.md b/README.md index 0cec356ac..3cc77bcdc 100644 --- a/README.md +++ b/README.md @@ -190,9 +190,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.200.7.tar.xz -$ tar xvfz armadillo-9.200.7.tar.xz -$ cd armadillo-9.200.7 +$ wget https://sourceforge.net/projects/arma/files/armadillo-9.300.2.tar.xz +$ tar xvfz armadillo-9.300.2.tar.xz +$ cd armadillo-9.300.2 $ cmake . $ make $ sudo make install @@ -219,9 +219,10 @@ $ sudo ldconfig #### Install [Glog](https://github.com/google/glog "Glog's Homepage"), a library that implements application-level logging: ~~~~~~ -$ wget https://github.com/google/glog/archive/v0.3.5.tar.gz -$ tar xvfz v0.3.5.tar.gz -$ cd glog-0.3.5 +$ wget https://github.com/google/glog/archive/v0.4.0.tar.gz +$ tar xvfz v0.4.0.tar.gz +$ cd glog-0.4.0 +$ ./autogen.sh $ ./configure $ make $ sudo make install