From 75af606c747a9b80bbb4ebf9c486be46e2a38a6f Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 12 Oct 2019 13:23:57 +0200 Subject: [PATCH] Recommend pkg-config, minor editing --- CMakeLists.txt | 10 ++++++++-- README.md | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dcbfc426b..0a73c0932 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1202,7 +1202,13 @@ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/c # Ensure that aclocal and libtool are present if(OS_IS_LINUX) 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 else() message(" aclocal has not been found.") @@ -2288,7 +2294,7 @@ else() endif() find_package(LIBAD9361) set_package_properties(LIBAD9361 PROPERTIES - PURPOSE "Used for configuring the AD9361 chipset" + PURPOSE "Used for configuring devices with the AD9361 chipset." TYPE OPTIONAL ) if(NOT LIBAD9361_FOUND) diff --git a/README.md b/README.md index 357288d1a..8fc927993 100644 --- a/README.md +++ b/README.md @@ -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: ~~~~~~ -$ 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-serialization-dev liblog4cpp5-dev libuhd-dev gnuradio-dev gr-osmosdr \ 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: ~~~~~~ -$ 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 \ python-mako python-six libmatio libpcap gtest protobuf ~~~~~~