aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.devcontainer/x86-64/devcontainer.json4
-rw-r--r--CMakeLists.txt5
2 files changed, 6 insertions, 3 deletions
diff --git a/.devcontainer/x86-64/devcontainer.json b/.devcontainer/x86-64/devcontainer.json
index ec50ecb..41e9a95 100644
--- a/.devcontainer/x86-64/devcontainer.json
+++ b/.devcontainer/x86-64/devcontainer.json
@@ -1,11 +1,11 @@
{
"name": "TeachOS on x86-64",
- "image": "registry.gitlab.ost.ch:45023/teachos/devcontainers/x86-64:15.2.0-2",
+ "image": "registry.gitlab.ost.ch:45023/teachos/devcontainers/x86-64:15.2.0-3",
"features": {
"ghcr.io/devcontainers/features/git:1": {},
"ghcr.io/devcontainers/features/git-lfs:1": {},
"ghcr.io/devcontainers-extra/features/apt-packages:1": {
- "packages": "cmake,grub2-common,grub-pc,mtools,ninja-build,qemu-system-x86,ssh,xorriso"
+ "packages": "clang-tidy-21,cmake,grub2-common,grub-pc,mtools,ninja-build,qemu-system-x86,ssh,xorriso"
}
},
"customizations": {
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2343c77..7654ed0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,10 @@ add_compile_options(
# Global Linting Configuration
#]============================================================================]
-find_program(CLANG_TIDY_EXE "clang-tidy")
+find_program(CLANG_TIDY_EXE NAMES
+ "clang-tidy-21"
+ "clang-tidy"
+)
if(CLANG_TIDY_EXE AND TEACHOS_ENABLE_LINTING)
set(CMAKE_C_CLANG_TIDY "${CLANG_TIDY_EXE}")