(#5760) cmake: add 3.20.3

* modernize source(self) * cmake: ad 3.20.3 * Update conandata.yml * Update conandata.yml
conan-io · Jun 7, 2021 · 19302b6 · 19302b6
1 parent cc94a08
commit 19302b6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/recipes/cmake/3.x.x/conandata.yml b/recipes/cmake/3.x.x/conandata.yml
@@ -101,3 +101,6 @@ sources:
   "3.20.2":
     sha256: aecf6ecb975179eb3bb6a4a50cae192d41e92b9372b02300f9e8f1d5f559544e
     url: https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2.tar.gz
+  "3.20.3":
+    sha256: 4d008ac3461e271fcfac26a05936f77fc7ab64402156fb371d41284851a651b8
+    url: https://github.com/Kitware/CMake/releases/download/v3.20.3/cmake-3.20.3.tar.gz
diff --git a/recipes/cmake/3.x.x/conanfile.py b/recipes/cmake/3.x.x/conanfile.py
@@ -2,6 +2,7 @@
 from conans import tools, ConanFile, CMake
 from conans.errors import ConanInvalidConfiguration, ConanException
 
+required_conan_version = ">=1.33.0"
 
 class CMakeConan(ConanFile):
     name = "cmake"
@@ -63,9 +64,7 @@ def requirements(self):
             self.requires("openssl/1.1.1k")
 
     def source(self):
-        tools.get(**self.conan_data["sources"][self.version])
-        extracted_dir = self.name + "-" + self.version
-        os.rename(extracted_dir, self._source_subfolder)
+        tools.get(**self.conan_data["sources"][self.version], strip_root=True, destination=self._source_subfolder)
 
     def _configure_cmake(self):
         if not self._cmake:

diff --git a/recipes/cmake/config.yml b/recipes/cmake/config.yml
@@ -67,3 +67,5 @@ versions:
     folder: "3.x.x"
   "3.20.2":
     folder: "3.x.x"
+  "3.20.3":
+    folder: "3.x.x"