Add CMake 3.20.0 and 3.19.7

bazel-contrib · Mar 28, 2021 · 37e6ae4 · 37e6ae4
1 parent 0379c97
commit 37e6ae4
Show file tree

Hide file tree

Showing 4 changed files with 224 additions and 60 deletions.
diff --git a/foreign_cc/repositories.bzl b/foreign_cc/repositories.bzl
@@ -12,7 +12,7 @@ load("//toolchains:toolchains.bzl", "built_toolchains", "prebuilt_toolchains", "
 def rules_foreign_cc_dependencies(
         native_tools_toolchains = [],
         register_default_tools = True,
-        cmake_version = "3.19.6",
+        cmake_version = "3.20.0",
         make_version = "4.3",
         ninja_version = "1.10.2",
         register_preinstalled_tools = True,

diff --git a/toolchains/built_toolchains.bzl b/toolchains/built_toolchains.bzl
@@ -25,7 +25,33 @@ def _cmake_toolchain(version):
     native.register_toolchains(
         "@rules_foreign_cc//toolchains:built_cmake_toolchain",
     )
-    if version == "3.19.6":
+    if "3.20.0" == version:
+        maybe(
+            http_archive,
+            name = "cmake_src",
+            build_file_content = _ALL_CONTENT,
+            sha256 = "9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755",
+            strip_prefix = "cmake-3.20.0",
+            urls = [
+                "https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0.tar.gz",
+            ],
+        )
+        return
+
+    if "3.19.7" == version:
+        maybe(
+            http_archive,
+            name = "cmake_src",
+            build_file_content = _ALL_CONTENT,
+            sha256 = "ec87ab67c45f47c4285f204280c5cde48e1c920cfcfed1555b27fb3b1a1d20ba",
+            strip_prefix = "cmake-3.19.7",
+            urls = [
+                "https://github.com/Kitware/CMake/releases/download/v3.19.7/cmake-3.19.7.tar.gz",
+            ],
+        )
+        return
+
+    if "3.19.6" == version:
         maybe(
             http_archive,
             name = "cmake_src",