From 7d38e4884d2c7ec5c24e8a72a3c799cef9faebee Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 12 Jul 2015 10:47:33 +0200 Subject: [PATCH] Updating Armadillo version to 5.200.2. Removed references to gfortran since it is no longer required --- CMakeLists.txt | 4 ++-- README.md | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b6ee58a87..9f0d1960f 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.1) - set(armadillo_MD5 "e316706ad744f5cc8aecd71213c142df") + set(armadillo_RELEASE 5.200.2) + set(armadillo_MD5 "ef57ba4c473a3b67c672441a7face09e") ExternalProject_Add( armadillo-${armadillo_RELEASE} diff --git a/README.md b/README.md index 4ad9a2ae9..e511d6ca6 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Note for Ubuntu 14.04 LTS "trusty" users: you will need to build from source and ### Manual installation of GNU Radio -Downloading, building and installing [GNU Radio](http://gnuradio.org/redmine/projects/gnuradio/wiki "GNU Radio's Homepage") and all its dependencies is not a simple task. We recommend to use [PyBOMBS](http://gnuradio.org/redmine/projects/pybombs/wiki) (Python Build Overlay Managed Bundle System), the GNU Radio install management system that automatically does all the work for you. In a terminal, type: +Downloading, building and installing [GNU Radio](http://gnuradio.org/redmine/projects/gnuradio/wiki "GNU Radio's Homepage") and all its dependencies is not a simple task. We recommend to use [PyBOMBS](http://gnuradio.org/redmine/projects/pybombs/wiki "Python Build Overlay Managed Bundle System wiki") (Python Build Overlay Managed Bundle System), the GNU Radio install management system that automatically does all the work for you. In a terminal, type: ~~~~~~ @@ -91,12 +91,12 @@ In case you do not want to use PyBOMBS and prefer to build and install GNU Radio #### Install the [Armadillo](http://arma.sourceforge.net/ "Armadillo's Homepage") C++ linear algebra library: ~~~~~~ -$ sudo apt-get install libopenblas-dev liblapack-dev gfortran # For Debian/Ubuntu/LinuxMint -$ sudo yum install lapack-devel blas-devel gcc-fortran # For Fedora/CentOS/RHEL -$ sudo zypper install lapack-devel blas-devel gcc-fortran # For OpenSUSE -$ wget http://sourceforge.net/projects/arma/files/armadillo-5.200.1.tar.gz -$ tar xvfz armadillo-5.200.1.tar.gz -$ cd armadillo-5.200.1 +$ 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 $ cmake . $ make $ sudo make install