Commit 2e701158 authored by Robert Schmidt's avatar Robert Schmidt

Merge remote-tracking branch 'origin/ubuntu-18-cmake' into websrv3

parents 9a0dd7c1 c6d88032
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
# Author: laurent THOMAS, Lionel GAUTHIER # Author: laurent THOMAS, Lionel GAUTHIER
cmake_minimum_required (VERSION 3.5) cmake_minimum_required (VERSION 3.12)
project (OpenAirInterface LANGUAGES C CXX) project (OpenAirInterface LANGUAGES C CXX)
######################################################### #########################################################
......
...@@ -523,7 +523,16 @@ check_install_soapy () { ...@@ -523,7 +523,16 @@ check_install_soapy () {
install_soapy_from_source install_soapy_from_source
#fi #fi
install_soapy_iris_from_source install_soapy_iris_from_source
}
# for ubuntu 18 we need a special repository (https://apt.kitware.com/) to install cmake >= 3.12
add_cmake_repo () {
$SUDO $INSTALLER -y install wget
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | $SUDO tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ bionic main' | $SUDO tee /etc/apt/sources.list.d/kitware.list >/dev/null
$SUDO $INSTALLER -y update
$SUDO rm /usr/share/keyrings/kitware-archive-keyring.gpg
$SUDO $INSTALLER -y install kitware-archive-keyring
} }
check_install_additional_tools (){ check_install_additional_tools (){
...@@ -578,6 +587,7 @@ check_install_oai_software() { ...@@ -578,6 +587,7 @@ check_install_oai_software() {
$SUDO apt install -y software-properties-common $SUDO apt install -y software-properties-common
case "$(get_distribution_release)" in case "$(get_distribution_release)" in
"ubuntu18.04") "ubuntu18.04")
add_cmake_repo
specific_packages="libgcrypt11-dev guile-2.0-dev" specific_packages="libgcrypt11-dev guile-2.0-dev"
;; ;;
"ubuntu20.04") "ubuntu20.04")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment