1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-11-06 01:56:25 +00:00

Merge branch 'next' of https://gitlab.com/gnss-sdr/gnss-sdr into next

This commit is contained in:
Carles Fernandez 2018-04-05 11:55:24 +02:00
commit ff1583e974

View File

@ -118,7 +118,7 @@ debian8.10:
stage: build stage: build
script: script:
- apt-get update - apt-get update
- apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git ca-certificates libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git ca-certificates libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev libgfortran-4.9-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev
- cd build - cd build
- cmake -DENABLE_OSMOSDR=ON .. - cmake -DENABLE_OSMOSDR=ON ..
- NPROC=$(grep -c ^processor /proc/cpuinfo) - NPROC=$(grep -c ^processor /proc/cpuinfo)
@ -168,6 +168,7 @@ debian10:
- make -j$(($NPROC+1)) - make -j$(($NPROC+1))
- make check - make check
- make install - make install
allow_failure: true
fedora26: fedora26:
@ -262,7 +263,7 @@ ubuntu14.04:
- add-apt-repository -y ppa:myriadrf/gnuradio - add-apt-repository -y ppa:myriadrf/gnuradio
- add-apt-repository -y ppa:myriadrf/drivers - add-apt-repository -y ppa:myriadrf/drivers
- apt-get update - apt-get update
- apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev - apt-get install -y --no-install-recommends build-essential libtool automake libhdf5-dev cmake git libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev libblas-dev liblapack-dev libgfortran-4.7-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libgtest-dev
- cd build - cd build
- cmake .. - cmake ..
- NPROC=$(grep -c ^processor /proc/cpuinfo) - NPROC=$(grep -c ^processor /proc/cpuinfo)