diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt index 5fbd570ed0fbb3c289f87346f331003e0a9f86bf..a110cca71a51ffcfc8860ff22f3dd68f85dc086f 100644 --- a/cmake_targets/CMakeLists.txt +++ b/cmake_targets/CMakeLists.txt @@ -548,7 +548,7 @@ set(HWLIB_IRIS_SOURCE ${OPENAIR_TARGETS}/ARCH/IRIS/USERSPACE/LIB/iris_lib.cpp ) add_library(oai_irisdevif MODULE ${HWLIB_IRIS_SOURCE}) -target_include_directories(oai_irisdevif PRIVATE /usr/local/lib/SoapySDR/modules0.6/) +target_include_directories(oai_irisdevif PRIVATE /usr/local/lib/SoapySDR/modules0.7/) target_link_libraries(oai_irisdevif SoapySDR) include_directories("${OPENAIR_TARGETS}/ARCH/mobipass/") diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index 582b44cb2debcd87721dffe0167b37ab1d6eab0a..18f59c86533d25da4905184c091a8e60c3721211 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -386,8 +386,8 @@ install_soapy_from_source(){ cd /tmp echo "Downloading SoapySDR" rm -rf /tmp/soapysdr - git clone https://github.com/pothosware/SoapySDR.git - cd soapysdr + git clone -b soapy-sdr-0.7.0 --single-branch https://github.com/pothosware/SoapySDR.git + cd SoapySDR #git checkout tags/release_003_010_001_001 mkdir -p build cd build @@ -399,8 +399,8 @@ install_soapy_from_source(){ cd /tmp echo "Downloading SoapyRemote" rm -rf /tmp/soapyremote - git clone https://github.com/pothosware/SoapyRemote.git - cd soapyremote + git clone -b soapy-remote-0.5.0 --single-branch https://github.com/pothosware/SoapyRemote.git + cd SoapyRemote #git checkout tags/release_003_010_001_001 mkdir -p build cd build @@ -419,7 +419,7 @@ install_soapy_iris_from_source(){ cd /tmp echo "Downloading SoapyIris" rm -rf /tmp/sklk-soapyiris - git clone https://github.com/skylarkwireless/sklk-soapyiris.git + git clone -b soapy-iris-2018.08.0.1 --single-branch https://github.com/skylarkwireless/sklk-soapyiris.git cd sklk-soapyiris mkdir -p build cd build @@ -434,14 +434,14 @@ install_soapy_iris_from_source(){ check_install_soapy () { #if [[ "$OS_DISTRO" == "ubuntu" ]]; then #first we remove old installation - $SUDO apt-get remove -y soapysdr soapysdr-server libsoapysdr-dev python-soapysdr python3-soapysdr soapysdr-module-remote || true - $SUDO add-apt-repository -y ppa:myriadrf/drivers - $SUDO apt-get update - $SUDO apt-get install -y soapysdr soapysdr-server libsoapysdr-dev python-soapysdr python3-soapysdr soapysdr-module-remote + $SUDO apt-get remove -y soapysdr soapysdr-server libsoapysdr-dev python-soapysdr python3-soapysdr soapysdr-module-remote || true + #$SUDO add-apt-repository -y ppa:myriadrf/drivers + #$SUDO apt-get update + #$SUDO apt-get install -y soapysdr soapysdr-server libsoapysdr-dev python-soapysdr python3-soapysdr soapysdr-module-remote #elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then # $SUDO $INSTALLER -y install software-properties-common python3-software-properties python-software-properties subversion git python3 python-numpy python3-numpy cmake swig python-dev - # install_soapy_from_source + install_soapy_from_source #fi install_soapy_iris_from_source