mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-31 11:19:18 +00:00
Code Issues Releases Wiki Activity

Updated armadillo version to 3.920.2

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@424 64b25241-fba3-4117-9849-534c7e92360d
This commit is contained in:
Carles Fernandez 2013-10-19 12:12:46 +00:00
parent 2972272b3e
commit 31f275958c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -373,8 +373,8 @@ if(NOT ARMADILLO_FOUND)
message (" Armadillo has not been found.") message (" Armadillo has not been found.")
message (" Armadillo will be downloaded and built automatically ") message (" Armadillo will be downloaded and built automatically ")
message (" when doing 'make'. ") message (" when doing 'make'. ")
set(armadillo_RELEASE 3.810.2) set(armadillo_RELEASE 3.920.2)
set(armadillo_MD5 "f91e3aff360d6a21fa7db36bb3dfe35f") set(armadillo_MD5 "3d0396513e2802c08152f50e18b4a1cd")
if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/download/armadillo-${armadillo_RELEASE}/armadillo-${armadillo_RELEASE}.tar.gz) if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/download/armadillo-${armadillo_RELEASE}/armadillo-${armadillo_RELEASE}.tar.gz)
set(ARMADILLO_PATCH_FILE ${CMAKE_CURRENT_BINARY_DIR}/armadillo-${armadillo_RELEASE}/armadillo_no.patch) set(ARMADILLO_PATCH_FILE ${CMAKE_CURRENT_BINARY_DIR}/armadillo-${armadillo_RELEASE}/armadillo_no.patch)
file(WRITE ${ARMADILLO_PATCH_FILE} "") file(WRITE ${ARMADILLO_PATCH_FILE} "")
@ -385,7 +385,7 @@ if(NOT ARMADILLO_FOUND)
< set(ARMA_USE_WRAPPER true ) < set(ARMA_USE_WRAPPER true )
--- ---
> set(ARMA_USE_WRAPPER false) > set(ARMA_USE_WRAPPER false)
292c292 323c323
< add_library( armadillo SHARED src/wrap_libs ) < add_library( armadillo SHARED src/wrap_libs )
--- ---
> add_library( armadillo STATIC src/wrap_libs ) > add_library( armadillo STATIC src/wrap_libs )

6
README
View File

@ -29,9 +29,9 @@ In order to avoid defining these variables each time you enter a session, you ma
- Download, compile, and install the Armadillo linear algebra library - Download, compile, and install the Armadillo linear algebra library
$ sudo apt-get install libatlas-dev $ sudo apt-get install libatlas-dev
$ wget http://sourceforge.net/projects/arma/files/armadillo-3.900.7.tar.gz $ wget http://sourceforge.net/projects/arma/files/armadillo-3.920.2.tar.gz
$ tar xvfz armadillo-3.900.7.tar.gz $ tar xvfz armadillo-3.920.2.tar.gz
$ cd armadillo-3.900.7 $ cd armadillo-3.920.2
$ cmake . $ cmake .
$ make $ make
$ sudo make install $ sudo make install