Require cmake 3.22.5 for consistency with Buddy

pull/194/head
Yuri D'Elia 2022-07-26 18:12:37 +02:00 committed by DRracer
parent 534347151a
commit 186c07d771
3 changed files with 6 additions and 7 deletions

View File

@ -13,7 +13,7 @@
"-isystem${workspaceFolder}/.dependencies/gcc-avr-7.3.0/avr/include/util", "-isystem${workspaceFolder}/.dependencies/gcc-avr-7.3.0/avr/include/util",
], ],
"cmake.buildDirectory": "${workspaceFolder}/build-vscode/${buildKit}", "cmake.buildDirectory": "${workspaceFolder}/build-vscode/${buildKit}",
"cmake.cmakePath": "${workspaceFolder}/.dependencies/cmake-3.21.3/bin/cmake", "cmake.cmakePath": "${workspaceFolder}/.dependencies/cmake-3.22.5/bin/cmake",
"cmake.generator": "Ninja", "cmake.generator": "Ninja",
"files.insertFinalNewline": true, "files.insertFinalNewline": true,
} }

View File

@ -7,7 +7,7 @@ run `./utils/bootstrap.py`
`bootstrap.py` will now download all the "missing" dependencies into the `.dependencies` folder: `bootstrap.py` will now download all the "missing" dependencies into the `.dependencies` folder:
- clang-format-9.0.0-noext - clang-format-9.0.0-noext
- cmake-3.21.3 - cmake-3.22.5
- ninja-1.10.2 - ninja-1.10.2
- gcc-avr-7.3.0 - gcc-avr-7.3.0

View File

@ -20,7 +20,6 @@ import zipfile
from argparse import ArgumentParser from argparse import ArgumentParser
from pathlib import Path from pathlib import Path
from urllib.request import urlretrieve from urllib.request import urlretrieve
project_root_dir = Path(__file__).resolve().parent.parent project_root_dir = Path(__file__).resolve().parent.parent
dependencies_dir = project_root_dir / '.dependencies' dependencies_dir = project_root_dir / '.dependencies'
@ -37,11 +36,11 @@ dependencies = {
}, },
}, },
'cmake': { 'cmake': {
'version': '3.21.3', 'version': '3.22.5',
'url': { 'url': {
'Linux': 'https://github.com/Kitware/CMake/releases/download/v3.21.3/cmake-3.21.3-linux-x86_64.tar.gz', 'Linux': 'https://github.com/Kitware/CMake/releases/download/v3.22.5/cmake-3.22.5-linux-x86_64.tar.gz',
'Windows': 'https://github.com/Kitware/CMake/releases/download/v3.21.3/cmake-3.21.3-windows-x86_64.zip', 'Windows': 'https://github.com/Kitware/CMake/releases/download/v3.22.5/cmake-3.22.5-windows-x86_64.zip',
'Darwin': 'https://github.com/Kitware/CMake/releases/download/v3.21.3/cmake-3.21.3-macos-universal.tar.gz', 'Darwin': 'https://github.com/Kitware/CMake/releases/download/v3.22.5/cmake-3.22.5-macos-universal.tar.gz',
}, },
}, },
'gcc-avr': { 'gcc-avr': {