From cb142107e73454b224162b6fcec7be4af6e2b3ab Mon Sep 17 00:00:00 2001 From: spham Date: Wed, 21 Apr 2021 09:27:34 -0700 Subject: [PATCH 1/2] Fixed targeting of cmake version --- scripts/build/build_node/Platform/Linux/install-ubuntu-awscli.sh | 0 .../build_node/Platform/Linux/install-ubuntu-build-libraries.sh | 0 .../build/build_node/Platform/Linux/install-ubuntu-build-tools.sh | 0 scripts/build/build_node/Platform/Linux/install-ubuntu-git.sh | 0 4 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/build/build_node/Platform/Linux/install-ubuntu-awscli.sh mode change 100644 => 100755 scripts/build/build_node/Platform/Linux/install-ubuntu-build-libraries.sh mode change 100644 => 100755 scripts/build/build_node/Platform/Linux/install-ubuntu-build-tools.sh mode change 100644 => 100755 scripts/build/build_node/Platform/Linux/install-ubuntu-git.sh diff --git a/scripts/build/build_node/Platform/Linux/install-ubuntu-awscli.sh b/scripts/build/build_node/Platform/Linux/install-ubuntu-awscli.sh old mode 100644 new mode 100755 diff --git a/scripts/build/build_node/Platform/Linux/install-ubuntu-build-libraries.sh b/scripts/build/build_node/Platform/Linux/install-ubuntu-build-libraries.sh old mode 100644 new mode 100755 diff --git a/scripts/build/build_node/Platform/Linux/install-ubuntu-build-tools.sh b/scripts/build/build_node/Platform/Linux/install-ubuntu-build-tools.sh old mode 100644 new mode 100755 diff --git a/scripts/build/build_node/Platform/Linux/install-ubuntu-git.sh b/scripts/build/build_node/Platform/Linux/install-ubuntu-git.sh old mode 100644 new mode 100755 From a14cd0102e70d549744a7abc8476b633fc749599 Mon Sep 17 00:00:00 2001 From: spham Date: Wed, 21 Apr 2021 09:28:28 -0700 Subject: [PATCH 2/2] Fixed cmake version targeting --- .../build_node/Platform/Linux/install-ubuntu-build-tools.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build/build_node/Platform/Linux/install-ubuntu-build-tools.sh b/scripts/build/build_node/Platform/Linux/install-ubuntu-build-tools.sh index 36832bb9ac..0c65610cf5 100755 --- a/scripts/build/build_node/Platform/Linux/install-ubuntu-build-tools.sh +++ b/scripts/build/build_node/Platform/Linux/install-ubuntu-build-tools.sh @@ -51,17 +51,17 @@ CMAKE_DEB_REPO="'deb https://apt.kitware.com/ubuntu/ $UBUNTU_DISTRO main'" # Add the appropriate kitware repository to apt if [ "$UBUNTU_DISTRO" == "bionic" ] then - CMAKE_DISTRO_VERSION=3.20.1-0kitware1ubuntu20.04.1 + CMAKE_DISTRO_VERSION=3.20.1-0kitware1ubuntu18.04.1 apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' elif [ "$UBUNTU_DISTRO" == "focal" ] then - CMAKE_DISTRO_VERSION=3.20.1-0kitware1ubuntu18.04.1 + CMAKE_DISTRO_VERSION=3.20.1-0kitware1ubuntu20.04.1 apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main' fi apt-get update # Install cmake -apt-get install cmake $CMAKE_DISTRO_VERSION -y +apt-get install cmake=$CMAKE_DISTRO_VERSION -y #