mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-10-24 11:35:54 +00:00
Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next
This commit is contained in:
commit
fc01ecdcf2
@ -407,7 +407,7 @@ set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
|
|||||||
set(GNSSSDR_GPSTK_LOCAL_VERSION "2.12")
|
set(GNSSSDR_GPSTK_LOCAL_VERSION "2.12")
|
||||||
set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.17")
|
set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.17")
|
||||||
set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.10")
|
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
|
if(CMAKE_VERSION VERSION_LESS "3.0.2") # Fix for CentOS 7
|
||||||
set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.1")
|
set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.1")
|
||||||
|
10
README.md
10
README.md
@ -594,6 +594,7 @@ In a terminal, type:
|
|||||||
~~~~~~
|
~~~~~~
|
||||||
$ sudo port selfupdate
|
$ sudo port selfupdate
|
||||||
$ sudo port upgrade outdated
|
$ sudo port upgrade outdated
|
||||||
|
$ sudo port install pkgconfig
|
||||||
$ sudo port install gnuradio
|
$ sudo port install gnuradio
|
||||||
$ sudo port install lapack
|
$ sudo port install lapack
|
||||||
$ sudo port install armadillo
|
$ sudo port install armadillo
|
||||||
@ -602,8 +603,10 @@ $ sudo port install google-glog +gflags
|
|||||||
$ sudo port install matio
|
$ sudo port install matio
|
||||||
$ sudo port install pugixml
|
$ sudo port install pugixml
|
||||||
$ sudo port install protobuf3-cpp
|
$ sudo port install protobuf3-cpp
|
||||||
$ sudo port install py27-mako
|
$ sudo port install libiio
|
||||||
$ sudo port install py27-six
|
$ sudo port install libad9361-iio
|
||||||
|
$ sudo port install py37-mako
|
||||||
|
$ sudo port install py37-six
|
||||||
$ sudo port install doxygen +docs
|
$ sudo port install doxygen +docs
|
||||||
~~~~~~
|
~~~~~~
|
||||||
|
|
||||||
@ -616,7 +619,7 @@ $ port select --list python
|
|||||||
and you can activate a certain version by typing:
|
and you can activate a certain version by typing:
|
||||||
|
|
||||||
~~~~~~
|
~~~~~~
|
||||||
$ sudo port select --set python python27
|
$ sudo port select --set python python37
|
||||||
~~~~~~
|
~~~~~~
|
||||||
|
|
||||||
#### <a name="homebrew">Homebrew</a>
|
#### <a name="homebrew">Homebrew</a>
|
||||||
@ -639,6 +642,7 @@ Install the required dependencies:
|
|||||||
|
|
||||||
~~~~~~
|
~~~~~~
|
||||||
$ brew install cmake
|
$ brew install cmake
|
||||||
|
$ brew install pkg-config
|
||||||
$ brew install hdf5
|
$ brew install hdf5
|
||||||
$ brew install lapack
|
$ brew install lapack
|
||||||
$ brew install armadillo
|
$ brew install armadillo
|
||||||
|
@ -27,7 +27,7 @@ if(NOT COMMAND feature_summary)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
find_path(GPSTK_INCLUDE_DIR gpstk/Rinex3ObsBase.hpp
|
find_path(GPSTK_INCLUDE_DIR gpstk/Rinex3ObsBase.hpp
|
||||||
HINTS /usr/include
|
PATHS /usr/include
|
||||||
/usr/local/include
|
/usr/local/include
|
||||||
/opt/local/include
|
/opt/local/include
|
||||||
${GPSTK_ROOT}/include
|
${GPSTK_ROOT}/include
|
||||||
@ -39,7 +39,7 @@ set(GPSTK_NAMES ${GPSTK_NAMES} gpstk libgpstk)
|
|||||||
include(GNUInstallDirs)
|
include(GNUInstallDirs)
|
||||||
|
|
||||||
find_library(GPSTK_LIBRARY NAMES ${GPSTK_NAMES}
|
find_library(GPSTK_LIBRARY NAMES ${GPSTK_NAMES}
|
||||||
HINTS /usr/lib
|
PATHS /usr/lib
|
||||||
/usr/local/lib
|
/usr/local/lib
|
||||||
/usr/${CMAKE_INSTALL_LIBDIR}
|
/usr/${CMAKE_INSTALL_LIBDIR}
|
||||||
/usr/local/${CMAKE_INSTALL_LIBDIR}
|
/usr/local/${CMAKE_INSTALL_LIBDIR}
|
||||||
|
Loading…
Reference in New Issue
Block a user