mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-31 07:13:03 +00:00
Code Issues Releases Wiki Activity

Update Armadillo version and other minor cleaning

Browse Source
This commit is contained in:
Carles Fernandez
2014-05-16 19:16:36 +02:00
parent f064ce4d4c
commit 1518e5ac5d
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -622,8 +622,8 @@ if(NOT ARMADILLO_FOUND)
INSTALL_COMMAND "" INSTALL_COMMAND ""
) )
else(OLD_GCC) else(OLD_GCC)
set(armadillo_RELEASE 4.300.2) set(armadillo_RELEASE 4.300.3)
set(armadillo_MD5 "16c8bf27e989b2eaf6e4096a4c056269") set(armadillo_MD5 "cdcd41961c3b06ac8cef9645c38bdf50") # cdcd41961c3b06ac8cef9645c38bdf50
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} "")
@@ -641,7 +641,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)
310c310 312c312
< add_library( armadillo SHARED \${PROJECT_SOURCE_DIR}/src/wrapper.cpp ) < add_library( armadillo SHARED \${PROJECT_SOURCE_DIR}/src/wrapper.cpp )
--- ---
> add_library( armadillo STATIC \${PROJECT_SOURCE_DIR}/src/wrapper.cpp ) > add_library( armadillo STATIC \${PROJECT_SOURCE_DIR}/src/wrapper.cpp )

4
src/core/system_parameters/MATH_CONSTANTS.h
View File

@@ -5,7 +5,7 @@
* *
* ------------------------------------------------------------------------- * -------------------------------------------------------------------------
* *
* Copyright (C) 2010-2013 (see AUTHORS file for a list of contributors) * Copyright (C) 2010-2014 (see AUTHORS file for a list of contributors)
* *
* GNSS-SDR is a software defined Global Navigation * GNSS-SDR is a software defined Global Navigation
* Satellite Systems receiver * Satellite Systems receiver
@@ -15,7 +15,7 @@
* GNSS-SDR is free software: you can redistribute it and/or modify * GNSS-SDR is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* at your option) any later version. * (at your option) any later version.
* *
* GNSS-SDR is distributed in the hope that it will be useful, * GNSS-SDR is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of