mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-15 03:35:46 +00:00
Code Issues Releases Wiki Activity

Updating armadillo version to 4.300.2

Browse Source
This commit is contained in:
Carles Fernandez 2014-05-11 22:19:53 +02:00
parent d6d90fe4f4
commit 190afb2c32
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -523,6 +523,7 @@ if(OS_IS_LINUX)
find_library(GFORTRAN NAMES gfortran find_library(GFORTRAN NAMES gfortran
PATHS /usr/lib PATHS /usr/lib
/usr/local/lib /usr/local/lib
/usr/local/lib/i386
/usr/lib/gcc/x86_64-linux-gnu /usr/lib/gcc/x86_64-linux-gnu
/usr/lib/gcc/i686-linux-gnu /usr/lib/gcc/i686-linux-gnu
/usr/lib/gcc/i386-linux-gnu /usr/lib/gcc/i386-linux-gnu
@ -621,8 +622,8 @@ if(NOT ARMADILLO_FOUND)
INSTALL_COMMAND "" INSTALL_COMMAND ""
) )
else(OLD_GCC) else(OLD_GCC)
set(armadillo_RELEASE 4.100.2) set(armadillo_RELEASE 4.300.2)
set(armadillo_MD5 "dd422706778cde656d531b3c3919766e") set(armadillo_MD5 "16c8bf27e989b2eaf6e4096a4c056269")
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} "")
@ -670,7 +671,7 @@ if(NOT ARMADILLO_FOUND)
set(ARMADILLO_INCLUDE_DIRS ${binary_dir}/include ) set(ARMADILLO_INCLUDE_DIRS ${binary_dir}/include )
find_library(lapack NAMES lapack HINTS /usr/lib /usr/local/lib /usr/lib64) find_library(lapack NAMES lapack HINTS /usr/lib /usr/local/lib /usr/lib64)
find_library(blas NAMES blas HINTS /usr/lib /usr/local/lib /usr/lib64) find_library(blas NAMES blas HINTS /usr/lib /usr/local/lib /usr/lib64)
set(ARMADILLO_LIBRARIES ${lapack} ${blas} gfortran ${binary_dir}/${CMAKE_FIND_LIBRARY_PREFIXES}armadillo.a) set(ARMADILLO_LIBRARIES ${lapack} ${blas} ${GFORTRAN} ${binary_dir}/${CMAKE_FIND_LIBRARY_PREFIXES}armadillo.a)
set(LOCAL_ARMADILLO true CACHE STRING "Armadillo downloaded and built automatically" FORCE) set(LOCAL_ARMADILLO true CACHE STRING "Armadillo downloaded and built automatically" FORCE)
# Save a copy at the thirdparty folder # Save a copy at the thirdparty folder
file(COPY ${CMAKE_CURRENT_BINARY_DIR}/armadillo-${armadillo_RELEASE} file(COPY ${CMAKE_CURRENT_BINARY_DIR}/armadillo-${armadillo_RELEASE}