Skip to content

Commit 6646fca

Browse files
committed
./install.sh./install.sh./install.sh./install.sh./install.sh./install.shURGENT FIX FOR UBUNTU 20.04 AND 22.04 MERGE ONLY THIS BRANCH TO MAIN NOW./install.sh./install.sh!
1 parent 9048c63 commit 6646fca

File tree

4 files changed

+8
-14
lines changed

4 files changed

+8
-14
lines changed

util/installation/debian/ubuntu-18.04/package_list_required

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
cmake
21
curl
32
freeglut3-dev
43
g++

util/installation/debian/ubuntu-18.04/prerequisites.sh

+4-6
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,17 @@ BDM_PROJECT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/../../../.."
3131
sudo apt-get update
3232
sudo apt-get install apt-transport-https
3333

34-
# Add ppa for newer CMake version
35-
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | sudo apt-key add -
36-
CODENAME=$(grep -oP '(?<=^UBUNTU_CODENAME=).+' /etc/os-release | tr -d '"')
37-
REPO="deb https://apt.kitware.com/ubuntu/ ${CODENAME} main"
38-
sudo apt-add-repository "$REPO"
39-
4034
# Update
4135
sudo apt-get update
4236

4337
# Install required packages
4438
sudo apt-get install -y \
4539
$(cat $BDM_PROJECT_DIR/util/installation/debian/ubuntu-18.04/package_list_required)
4640

41+
curl -L -O https://github.com/Kitware/CMake/releases/download/v3.19.3/cmake-3.19.3-Linux-x86_64.sh
42+
chmod +x cmake-3.19.3-Linux-x86_64.sh
43+
sudo ./cmake-3.19.3-Linux-x86_64.sh --skip-license --prefix=/usr/local
44+
4745
if [ -n "${PYENV_ROOT}" ]; then
4846
unset PYENV_ROOT
4947
fi

util/installation/debian/ubuntu-22.04/package_list_required

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
cmake
21
curl
32
freeglut3-dev
43
g++

util/installation/debian/ubuntu-22.04/prerequisites.sh

+4-6
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ BDM_PROJECT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/../../../.."
3131
sudo apt-get update
3232
sudo apt-get install apt-transport-https
3333

34-
# Add ppa for newer CMake version
35-
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | sudo apt-key add -
36-
CODENAME=$(grep -oP '(?<=^UBUNTU_CODENAME=).+' /etc/os-release | tr -d '"')
37-
REPO="deb https://apt.kitware.com/ubuntu/ ${CODENAME} main"
38-
sudo apt-add-repository "$REPO"
39-
4034
# Update
4135
sudo apt-get update
4236
sudo apt install -y cmake-data=3.22.1-1ubuntu1.22.04.1
@@ -45,6 +39,10 @@ sudo apt install -y cmake-data=3.22.1-1ubuntu1.22.04.1
4539
sudo apt-get install -y \
4640
$(cat $BDM_PROJECT_DIR/util/installation/debian/ubuntu-22.04/package_list_required)
4741

42+
curl -L -O https://github.com/Kitware/CMake/releases/download/v3.19.3/cmake-3.19.3-Linux-x86_64.sh
43+
chmod +x cmake-3.19.3-Linux-x86_64.sh
44+
sudo ./cmake-3.19.3-Linux-x86_64.sh --skip-license --prefix=/usr/local
45+
4846
if [ -n "${PYENV_ROOT}" ]; then
4947
unset PYENV_ROOT
5048
fi

0 commit comments

Comments
 (0)