Skip to content

Commit fffed33

Browse files
authored
Merge pull request #11043 from bablokb/cmake_version
install necessary cmake version directly from cmake github releases
2 parents 99aef43 + 659ec16 commit fffed33

2 files changed

Lines changed: 6 additions & 111 deletions

File tree

.devcontainer/add_kitware_archive.sh

Lines changed: 0 additions & 107 deletions
This file was deleted.

.devcontainer/common_tools.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@
99
# -----------------------------------------------------------------------------
1010

1111
REPO_ROOT="/workspaces/circuitpython"
12+
CMAKE_VERSION="3.31.12"
1213

1314
echo -e "[common_tools.sh] starting install"
1415
cd "$REPO_ROOT"
1516

1617
# --- repositories and tools ------------------------------------------------
1718

18-
echo -e "[common_tools.sh] adding kitware-archive (for current CMAKE)"
19-
sudo .devcontainer/add_kitware_archive.sh
20-
echo -e "[common_tools.sh] installing current version of CMAKE"
21-
sudo apt-get -y install cmake
19+
echo -e "[common_tools.sh] installing CMAKE $CMAKE_VERSION"
20+
wget -q https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-linux-$(arch).sh
21+
chmod +x cmake-$CMAKE_VERSION-linux-$(arch).sh
22+
sudo ./cmake-$CMAKE_VERSION-linux-$(arch).sh --prefix=/usr/local --skip-license
23+
rm cmake-$CMAKE_VERSION-linux-$(arch).sh
2224

2325
echo -e "[common_tools.sh] adding pybricks/ppa"
2426
sudo add-apt-repository -y ppa:pybricks/ppa

0 commit comments

Comments
 (0)