From 28c8ff8121c0772171640e0da6a97df0b199547e Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 1 May 2015 18:31:31 +0200 Subject: [PATCH] Improve instructions for Ubuntu 14.04 LTS users. Updated Armadillo version --- CMakeLists.txt | 4 ++-- README.md | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c94d8d79..1961e0882 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -696,8 +696,8 @@ if(NOT ARMADILLO_FOUND) message(STATUS " Armadillo will be downloaded and built automatically ") message(STATUS " when doing 'make'. ") - set(armadillo_RELEASE 4.650.4) - set(armadillo_MD5 "e575dc01cf60e290a467c7c6d3171ef3") + set(armadillo_RELEASE 5.100.1) + set(armadillo_MD5 "6926fbf81bde99d777e3d09d034b308a") ExternalProject_Add( armadillo-${armadillo_RELEASE} diff --git a/README.md b/README.md index e5cbc8365..24a4b9f98 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ $ sudo apt-get install build-essential cmake git libboost-dev libboost-date-time Once you have installed these packages, you can jump directly to [how to download the source code and build GNSS-SDR](#download-and-build-linux). Alternatively, if you need to manually install those libraries, please keep reading. -Note for Ubuntu 14.04 LTS "trusty" users: you will need to build from source and install GNU Radio manually, as explained below, since GNSS-SDR requires gnuradio-dev >= 3.7.3, and Ubuntu 14.04 came with 3.7.2. +Note for Ubuntu 14.04 LTS "trusty" users: you will need to build from source and install GNU Radio manually, as explained below, since GNSS-SDR requires gnuradio-dev >= 3.7.3, and Ubuntu 14.04 came with 3.7.2. Install all the packages above BUT EXCEPT ```libuhd-dev```, ```gnuradio-dev``` and ```gr-osmosdr``` (and remove them if they are already installed in your machine), and install those dependencies using PyBOMBS. ### Manual installation of GNU Radio @@ -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 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-4.650.4.tar.gz -$ tar xvfz armadillo-4.650.4.tar.gz -$ cd armadillo-4.650.4 +$ wget http://sourceforge.net/projects/arma/files/armadillo-5.100.1.tar.gz +$ tar xvfz armadillo-5.100.1.tar.gz +$ cd armadillo-5.100.1 $ cmake . $ make $ sudo make install