[hamradio-commits] [gnss-sdr] 239/251: Armadillo version update

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.

commit ae1cf91da674d6090581dd7e5c2ba4437af16534
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Mon Aug 24 13:51:07 2015 +0200

    Armadillo version update
---
 CMakeLists.txt |  4 ++--
 README.md      | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb19033..7c7aeb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -711,8 +711,8 @@ if(NOT ARMADILLO_FOUND)
      message(STATUS " Armadillo will be downloaded and built automatically ")
      message(STATUS " when doing 'make'. ")
 
-     set(armadillo_RELEASE 5.200.2)
-     set(armadillo_MD5 "ef57ba4c473a3b67c672441a7face09e")
+     set(armadillo_RELEASE 5.400.2)
+     set(armadillo_MD5 "0f06e5ddef5a3a8ef86f3a7bc480dec3")
 
      ExternalProject_Add(
          armadillo-${armadillo_RELEASE}
diff --git a/README.md b/README.md
index 6a227b7..4ff47bf 100644
--- a/README.md
+++ b/README.md
@@ -94,9 +94,9 @@ In case you do not want to use PyBOMBS and prefer to build and install GNU Radio
 $ sudo apt-get install libopenblas-dev liblapack-dev   # For Debian/Ubuntu/LinuxMint
 $ sudo yum install lapack-devel blas-devel             # For Fedora/CentOS/RHEL
 $ sudo zypper install lapack-devel blas-devel          # For OpenSUSE
-$ wget http://sourceforge.net/projects/arma/files/armadillo-5.200.2.tar.gz
-$ tar xvfz armadillo-5.200.2.tar.gz
-$ cd armadillo-5.200.2
+$ wget http://sourceforge.net/projects/arma/files/armadillo-5.400.2.tar.gz
+$ tar xvfz armadillo-5.400.2.tar.gz
+$ cd armadillo-5.400.2
 $ cmake .
 $ make
 $ sudo make install
@@ -134,23 +134,23 @@ $ sudo ldconfig
 
    
 
-#### Build the [Google C++ Testing Framework](http://code.google.com/p/googletest/ "Googletest Homepage"), also known as googletest:
+#### Build the [Google C++ Testing Framework](https://github.com/google/googletest "Googletest Homepage"), also known as googletest:
 
 ~~~~~~ 
-$ wget http://googletest.googlecode.com/files/gtest-1.7.0.zip
-$ unzip gtest-1.7.0.zip
-$ cd gtest-1.7.0
-$ ./configure
+$ wget https://github.com/google/googletest/archive/release-1.7.0.zip
+$ unzip release-1.7.0.zip
+$ cd googletest-release-1.7.0
+$ cmake .
 $ make
 ~~~~~~ 
 
-Please **DO NOT install** gtest (do *not* type ```sudo make install```). Every user needs to compile his tests using the same compiler flags used to compile the installed Google Test libraries; otherwise he may run into undefined behaviors (i.e. the tests can behave strangely and may even crash for no obvious reasons). The reason is that C++ has this thing called the One-Definition Rule: if two C++ source files contain different definitions of the same class/function/variable, and you li [...]
+Please **DO NOT install** googletest (do *not* type ```sudo make install```). Every user needs to compile his tests using the same compiler flags used to compile the installed Google Test libraries; otherwise he may run into undefined behaviors (i.e. the tests can behave strangely and may even crash for no obvious reasons). The reason is that C++ has this thing called the One-Definition Rule: if two C++ source files contain different definitions of the same class/function/variable, and y [...]
 
 ~~~~~~ 
 export GTEST_DIR=/home/username/gtest-1.7.0
 ~~~~~~ 
 
-changing /home/username/gtest-1.7.0 by the actual directory where you downloaded gtest. 
+changing /home/username/gtest-1.7.0 by the actual directory where you downloaded googletest. 
 
    
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git