From 9ca639ee4c7c6198a94c97662c16d67a7c87207c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 30 Oct 2019 16:09:43 +0100 Subject: [PATCH 1/3] Update list of Macports dependencies --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 22c7d4c76..710f17e3b 100644 --- a/README.md +++ b/README.md @@ -594,6 +594,7 @@ In a terminal, type: ~~~~~~ $ sudo port selfupdate $ sudo port upgrade outdated +$ sudo port install pkgconfig $ sudo port install gnuradio $ sudo port install lapack $ sudo port install armadillo @@ -602,8 +603,10 @@ $ sudo port install google-glog +gflags $ sudo port install matio $ sudo port install pugixml $ sudo port install protobuf3-cpp -$ sudo port install py27-mako -$ sudo port install py27-six +$ sudo port install libiio +$ sudo port install libad9361-iio +$ sudo port install py37-mako +$ sudo port install py37-six $ sudo port install doxygen +docs ~~~~~~ @@ -616,7 +619,7 @@ $ port select --list python and you can activate a certain version by typing: ~~~~~~ -$ sudo port select --set python python27 +$ sudo port select --set python python37 ~~~~~~ #### Homebrew @@ -639,6 +642,7 @@ Install the required dependencies: ~~~~~~ $ brew install cmake +$ brew install pkg-config $ brew install hdf5 $ brew install lapack $ brew install armadillo From 6f278bdf94a88053c47fab13b5ee6fd0ddf6b347 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 30 Oct 2019 16:10:22 +0100 Subject: [PATCH 2/3] Replace HINTS by PATHS --- cmake/Modules/FindGPSTK.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Modules/FindGPSTK.cmake b/cmake/Modules/FindGPSTK.cmake index cf61cb2ff..abf26ebdb 100644 --- a/cmake/Modules/FindGPSTK.cmake +++ b/cmake/Modules/FindGPSTK.cmake @@ -27,7 +27,7 @@ if(NOT COMMAND feature_summary) endif() find_path(GPSTK_INCLUDE_DIR gpstk/Rinex3ObsBase.hpp - HINTS /usr/include + PATHS /usr/include /usr/local/include /opt/local/include ${GPSTK_ROOT}/include @@ -39,7 +39,7 @@ set(GPSTK_NAMES ${GPSTK_NAMES} gpstk libgpstk) include(GNUInstallDirs) find_library(GPSTK_LIBRARY NAMES ${GPSTK_NAMES} - HINTS /usr/lib + PATHS /usr/lib /usr/local/lib /usr/${CMAKE_INSTALL_LIBDIR} /usr/local/${CMAKE_INSTALL_LIBDIR} From 6419c879c809e89e575caa4bac8be1f945cf04e2 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 30 Oct 2019 16:47:16 +0100 Subject: [PATCH 3/3] Update ProtocolBuffers version to 3.10.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 74c539020..5173456b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -407,7 +407,7 @@ set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master") set(GNSSSDR_GPSTK_LOCAL_VERSION "2.12") set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.17") set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.10") -set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.10.0") +set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.10.1") if(CMAKE_VERSION VERSION_LESS "3.0.2") # Fix for CentOS 7 set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.1")