From 43d8ee586f254b463ae20d7458bc3714138518a5 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Tue, 17 Jan 2023 16:43:16 +0100 Subject: [PATCH 1/3] Upgrade cmake to 3.12 Prior to this version, we cannot use target_link_libraries() with OBJECT libraries. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 116b8a55d2..d168aa746e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ # Author: laurent THOMAS, Lionel GAUTHIER -cmake_minimum_required (VERSION 3.5) +cmake_minimum_required (VERSION 3.12) project (OpenAirInterface LANGUAGES C CXX) ######################################################### From 2debc770ec7e5b0a3a60f1d4fd7c886796e14d65 Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Fri, 17 Feb 2023 23:10:41 +0100 Subject: [PATCH 2/3] add repo for ubuntu 18 to install cmake >= 3.12 --- cmake_targets/tools/build_helper | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index 5af626b182..b45579f525 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -523,7 +523,15 @@ check_install_soapy () { install_soapy_from_source #fi install_soapy_iris_from_source +} +# for ubuntu 18 we need a special repository to install cmake >= 3.12 +add_cmake_repo () { + 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 apt-get update + $SUDO rm /usr/share/keyrings/kitware-archive-keyring.gpg + $SUDO apt-get install kitware-archive-keyring } check_install_additional_tools (){ @@ -578,6 +586,7 @@ check_install_oai_software() { $SUDO apt install -y software-properties-common case "$(get_distribution_release)" in "ubuntu18.04") + add_cmake_repo specific_packages="libgcrypt11-dev guile-2.0-dev" ;; "ubuntu20.04") From c6d880329d40618517a8b969687a52824fa3286a Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Tue, 21 Feb 2023 12:07:28 +0100 Subject: [PATCH 3/3] Install cmake >= 3.12 on Ubuntu 18 fix, link to repo added --- cmake_targets/tools/build_helper | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index b45579f525..4c951890d9 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -525,13 +525,14 @@ check_install_soapy () { install_soapy_iris_from_source } -# for ubuntu 18 we need a special repository to install cmake >= 3.12 +# for ubuntu 18 we need a special repository (https://apt.kitware.com/) to install cmake >= 3.12 add_cmake_repo () { - 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 apt-get update + $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 apt-get install kitware-archive-keyring + $SUDO $INSTALLER -y install kitware-archive-keyring } check_install_additional_tools (){