From 5c885627b5a3bbb26773910e801656a506a45c83 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Fri, 9 Oct 2015 14:47:48 +0200 Subject: [PATCH 1/4] Fix building on ArchLinux --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ea860622b..927ba72c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1085,9 +1085,9 @@ endif(ENABLE_GPROF) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_CXX_FLAGS}") if(OS_IS_LINUX) - if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "openSUSE") + if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "openSUSE" OR ${LINUX_DISTRIBUTION} MATCHES "ArchLinux") link_libraries(pthread) - endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "openSUSE") + endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "openSUSE" OR ${LINUX_DISTRIBUTION} MATCHES "ArchLinux") endif(OS_IS_LINUX) From df6bd17bd844cddf46ce3f7e2a86fcde4a5eb24b Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 25 Oct 2015 11:26:21 +0100 Subject: [PATCH 2/4] Adding the CGRAN manifest --- MANIFEST.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 MANIFEST.md diff --git a/MANIFEST.md b/MANIFEST.md new file mode 100644 index 000000000..7d8dbe48a --- /dev/null +++ b/MANIFEST.md @@ -0,0 +1,25 @@ +title: gnss.sdr +brief: An open source global navigation satellite systems software defined receiver +tags: + - sdr + - gnss + - gps + - Galileo +author: + - Carles Fernandez-Prades + - Javier Arribas + - et altri (see AUTHORS file for a list of contributors) +copyright_owner: + - The Authors +dependencies: gnuradio (>= 3.7.3), armadillo, gflags, glog, gnutls +license: GPLv3+ +repo: https://github.com/gnss-sdr/gnss-sdr +website: http://gnss-sdr.org +icon: http://a.fsdn.com/con/app/proj/gnss-sdr/screenshots/logo400x400.jpg +--- +Global Navigation Satellite Systems receiver defined by software. It performs all the signal +processing from raw signal samples up to the computation of the Position-Velocity-Time solution, +including code and phase observables. It is able to work with raw data files or, if there is +computational power enough, in real time with suitable radiofrequency front-ends. This software +is mainly developed at [CTTC](http://www.cttc.es "Centre Tecnologic de Telecomunicacions de Catalunya") +with contributions from around the world. More info at [gnss-sdr.org](http://gnss-sdr.org "GNSS-SDR's Homepage"). \ No newline at end of file From 8838e9063e7479c1c6339e0d012724d269e8d000 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Tue, 3 Nov 2015 08:26:27 +0100 Subject: [PATCH 3/4] Fix bug in CGRAN manifest --- MANIFEST.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.md b/MANIFEST.md index 7d8dbe48a..eb7ee5617 100644 --- a/MANIFEST.md +++ b/MANIFEST.md @@ -1,4 +1,4 @@ -title: gnss.sdr +title: gnss-sdr brief: An open source global navigation satellite systems software defined receiver tags: - sdr From 5e3466ff0bd9439d4dda136ab5bf316e9307327e Mon Sep 17 00:00:00 2001 From: sundw Date: Sun, 15 Nov 2015 23:04:42 +0800 Subject: [PATCH 4/4] update version of armadillo in CMakeLists.txt --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 927ba72c8..31cfe90aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -733,8 +733,8 @@ if(NOT ARMADILLO_FOUND) message(STATUS " Armadillo will be downloaded and built automatically ") message(STATUS " when doing 'make'. ") - set(armadillo_RELEASE 5.200.2) - set(armadillo_MD5 "ef57ba4c473a3b67c672441a7face09e") + set(armadillo_RELEASE 6.200.4) + set(armadillo_MD5 "20c9de6ad06b4339a7fd3f67d78922e4") ExternalProject_Add( armadillo-${armadillo_RELEASE}