mirrors
/
gnss-sdr
mirror of https://github.com/gnss-sdr/gnss-sdr
1
0
Fork 0
Code Issues Releases Wiki Activity

Recommend pkg-config, minor editing

This commit is contained in:
Carles Fernandez 2019-10-12 13:23:57 +02:00
parent 7126185515
commit 75af606c74
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -1202,7 +1202,13 @@ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/c
# Ensure that aclocal and libtool are present # Ensure that aclocal and libtool are present
if(OS_IS_LINUX) if(OS_IS_LINUX)
if(EXISTS "/usr/bin/libtoolize") if(EXISTS "/usr/bin/libtoolize")
if(EXISTS "/usr/bin/aclocal" OR EXISTS "/usr/bin/aclocal-1.16" OR EXISTS "/usr/bin/aclocal-1.15" OR EXISTS "/usr/bin/aclocal-1.14" OR EXISTS "/usr/bin/aclocal-1.13" OR EXISTS "/usr/bin/aclocal-1.11" OR EXISTS "/usr/bin/aclocal-1.10") if(EXISTS "/usr/bin/aclocal" OR
EXISTS "/usr/bin/aclocal-1.16" OR
EXISTS "/usr/bin/aclocal-1.15" OR
EXISTS "/usr/bin/aclocal-1.14" OR
EXISTS "/usr/bin/aclocal-1.13" OR
EXISTS "/usr/bin/aclocal-1.11" OR
EXISTS "/usr/bin/aclocal-1.10")
# Everything ok, we can move on # Everything ok, we can move on
else() else()
message(" aclocal has not been found.") message(" aclocal has not been found.")
@ -2288,7 +2294,7 @@ else()
endif() endif()
find_package(LIBAD9361) find_package(LIBAD9361)
set_package_properties(LIBAD9361 PROPERTIES set_package_properties(LIBAD9361 PROPERTIES
PURPOSE "Used for configuring the AD9361 chipset" PURPOSE "Used for configuring devices with the AD9361 chipset."
TYPE OPTIONAL TYPE OPTIONAL
) )
if(NOT LIBAD9361_FOUND) if(NOT LIBAD9361_FOUND)

4
README.md
View File

@ -63,7 +63,7 @@ If you want to start building and running GNSS-SDR as quick and easy as possible
If you are using Debian 8, Ubuntu 14.10 or above, this can be done by copying and pasting the following line in a terminal: If you are using Debian 8, Ubuntu 14.10 or above, this can be done by copying and pasting the following line in a terminal:
~~~~~~ ~~~~~~
$ sudo apt-get install build-essential cmake git libboost-dev libboost-date-time-dev \ $ sudo apt-get install build-essential cmake git pkg-config libboost-dev libboost-date-time-dev \
libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev \ libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev \
libboost-serialization-dev liblog4cpp5-dev libuhd-dev gnuradio-dev gr-osmosdr \ libboost-serialization-dev liblog4cpp5-dev libuhd-dev gnuradio-dev gr-osmosdr \
libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev \ libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev \
@ -84,7 +84,7 @@ Once you have installed these packages, you can jump directly to [download the s
If you are using Arch Linux: If you are using Arch Linux:
~~~~~~ ~~~~~~
$ pacman -S gcc make cmake git boost boost-libs log4cpp libvolk gnuradio \ $ pacman -S gcc make cmake pkgconf git boost boost-libs log4cpp libvolk gnuradio \
blas lapack gflags google-glog openssl pugixml \ blas lapack gflags google-glog openssl pugixml \
python-mako python-six libmatio libpcap gtest protobuf python-mako python-six libmatio libpcap gtest protobuf
~~~~~~ ~~~~~~