diff --git a/cmake/FindClangFormat.cmake b/cmake/FindClangFormat.cmake
index 571fd142..66069dfe 100644
--- a/cmake/FindClangFormat.cmake
+++ b/cmake/FindClangFormat.cmake
@@ -6,7 +6,10 @@ set(ClangFormat_BIN_NAME
     clang-format-5.0
     clang-format-6.0
     clang-format-7
-    clang-format-8)
+    clang-format-8
+    clang-format-9
+    clang-format-10
+    clang-format-11)
 
 find_program(ClangFormat_BIN NAMES ${ClangFormat_BIN_NAME})
 
diff --git a/cmake/FindClangTidy.cmake b/cmake/FindClangTidy.cmake
index e182f4cd..c3d48f92 100644
--- a/cmake/FindClangTidy.cmake
+++ b/cmake/FindClangTidy.cmake
@@ -6,7 +6,10 @@ set(ClangTidy_BIN_NAME
     clang-tidy-5.0
     clang-tidy-6.0
     clang-tidy-7
-    clang-tidy-8)
+    clang-tidy-8
+    clang-tidy-9
+    clang-tidy-10
+    clang-tidy-11)
 
 find_program(ClangTidy_BIN NAMES ${ClangTidy_BIN_NAME})