czoido · czoido · Dec 13, 2022 · Dec 12, 2022 · Dec 12, 2022 · Dec 12, 2022
diff --git a/.jenkins/new_toolchains.jenkins b/.jenkins/new_toolchains.jenkins
@@ -317,15 +317,18 @@ node('Linux') {
                     node('Windows') {
                         conanBranchesInstalls.each { branch ->
                             stage("${branch.name}") {
-                                createReference([python_host: 'C:\\Python39\\python.exe',
-                                                shFunction: { data -> bat(data) },
-                                                shReturnCode: { data -> bat(script: data, returnStatus: true) },
-                                                isWindows: true,
-                                                isInsideDocker: false,
-                                                profileHost: getWindowsProfile(branch.name),
-                                                branch: branch,
-                                                upload: shouldUpload(branch.name)],
-                                                toBuild)
+                                String cmakePath = "C:\\cmake\\cmake-3.17.5-win64-x64\\bin"
+                                withEnv(["PATH+CMAKE=${cmakePath}"]) {
+                                    createReference([python_host: 'C:\\Python39\\python.exe',
+                                                    shFunction: { data -> bat(data) },
+                                                    shReturnCode: { data -> bat(script: data, returnStatus: true) },
+                                                    isWindows: true,
+                                                    isInsideDocker: false,
+                                                    profileHost: getWindowsProfile(branch.name),
+                                                    branch: branch,
+                                                    upload: shouldUpload(branch.name)],
+                                                    toBuild)
+                                }
                             }
                         }
                     }

diff --git a/recipes/cmake/3.x.x/conandata.yml b/recipes/cmake/3.x.x/conandata.yml
@@ -1,148 +1,22 @@
 sources:
-  "3.15.7":
-    sha256: 71999d8a14c9b51708847371250a61533439a7331eb7702ac105cfb3cb1be54b
-    url: https://cmake.org/files/v3.15/cmake-3.15.7.tar.gz
-  # "3.16.2":
-  #   sha256: 8c09786ec60ca2be354c29829072c38113de9184f29928eb9da8446a5f2ce6a9
-  #   url: https://cmake.org/files/v3.16/cmake-3.16.2.tar.gz
-  # "3.16.3":
-  #   sha256: e54f16df9b53dac30fd626415833a6e75b0e47915393843da1825b096ee60668
-  #   url: https://cmake.org/files/v3.16/cmake-3.16.3.tar.gz
-  # "3.16.4":
-  #   sha256: 9bcc8c114d9da603af9512083ed7d4a39911d16105466beba165ba8fe939ac2c
-  #   url: https://cmake.org/files/v3.16/cmake-3.16.4.tar.gz
-  # "3.16.5":
-  #   sha256: 5f760b50b8ecc9c0c37135fae5fbf00a2fef617059aa9d61c1bb91653e5a8bfc
-  #   url: https://cmake.org/files/v3.16/cmake-3.16.5.tar.gz
-  # "3.16.6":
-  #   sha256: 6f6ff1a197851b0fa8412ff5de602e6717a4eb9509b2c385b08589c4e7a16b62
-  #   url: https://cmake.org/files/v3.16/cmake-3.16.6.tar.gz
-  # "3.16.7":
-  #   sha256: 5f49c95a2933b1800f14840f3a389f4cef0b19093985a35053b43f38ec21358f
-  #   url: https://cmake.org/files/v3.16/cmake-3.16.7.tar.gz
-  # "3.16.8":
-  #   sha256: 177434021132686cb901fea7db9fa2345efe48d566b998961594d5cc346ac588
-  #   url: https://cmake.org/files/v3.16/cmake-3.16.8.tar.gz
-  "3.16.9":
-    sha256: 1708361827a5a0de37d55f5c9698004c035abb1de6120a376d5d59a81630191f
-    url: https://cmake.org/files/v3.16/cmake-3.16.9.tar.gz
-  # "3.17.0":
-  #   sha256: b74c05b55115eacc4fa2b77a814981dbda05cdc95a53e279fe16b7b272f00847
-  #   url: https://cmake.org/files/v3.17/cmake-3.17.0.tar.gz
-  # "3.17.1":
-  #   sha256: 3aa9114485da39cbd9665a0bfe986894a282d5f0882b1dea960a739496620727
-  #   url: https://cmake.org/files/v3.17/cmake-3.17.1.tar.gz
-  # "3.17.2":
-  #   sha256: fc77324c4f820a09052a7785549b8035ff8d3461ded5bbd80d252ae7d1cd3aa5
-  #   url: https://cmake.org/files/v3.17/cmake-3.17.2.tar.gz
-  # "3.17.3":
-  #   sha256: 0bd60d512275dc9f6ef2a2865426a184642ceb3761794e6b65bff233b91d8c40
-  #   url: https://cmake.org/files/v3.17/cmake-3.17.3.tar.gz
-  # "3.17.4":
-  #   sha256: 86985d73d0a63ec99c236aab5287316e252164f33d7c4cb160954a980c71f36f
-  #   url: https://cmake.org/files/v3.17/cmake-3.17.4.tar.gz
-  "3.17.5":
-    sha256: 8c3083d98fd93c1228d5e4e40dbff2dd88f4f7b73b9fa24a2938627b8bc28f1a
-    url: https://cmake.org/files/v3.17/cmake-3.17.5.tar.gz
-  # "3.18.0":
-  #   sha256: 83b4ffcb9482a73961521d2bafe4a16df0168f03f56e6624c419c461e5317e29
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.18.0/cmake-3.18.0.tar.gz
-  # "3.18.1":
-  #   sha256: c0e3338bd37e67155b9d1e9526fec326b5c541f74857771b7ffed0c46ad62508
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.18.1/cmake-3.18.1.tar.gz
-  # "3.18.2":
-  #   sha256: 5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.18.2/cmake-3.18.2.tar.gz
-  # "3.18.3":
-  #   sha256: 2c89f4e30af4914fd6fb5d00f863629812ada848eee4e2d29ec7e456d7fa32e5
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.18.3/cmake-3.18.3.tar.gz
-  # "3.18.4":
-  #   sha256: 597c61358e6a92ecbfad42a9b5321ddd801fc7e7eca08441307c9138382d4f77
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.18.4/cmake-3.18.4.tar.gz
-  # "3.18.5":
-  #   sha256: 080bf24b0f73f4bf3ec368d2be1aa59369b9bb1cd693deeb6f18fe553ca74ab4
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.18.5/cmake-3.18.5.tar.gz
-  "3.18.6":
-    sha256: 124f571ab70332da97a173cb794dfa09a5b20ccbb80a08e56570a500f47b6600
-    url: https://github.com/Kitware/CMake/releases/download/v3.18.6/cmake-3.18.6.tar.gz
-  # "3.19.0":
-  #   sha256: fdda688155aa7e72b7c63ef6f559fca4b6c07382ea6dca0beb5f45aececaf493
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.19.0/cmake-3.19.0.tar.gz
-  # "3.19.1":
-  #   sha256: 1d266ea3a76ef650cdcf16c782a317cb4a7aa461617ee941e389cb48738a3aba
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.19.1/cmake-3.19.1.tar.gz
-  # "3.19.2":
-  #   sha256: e3e0fd3b23b7fb13e1a856581078e0776ffa2df4e9d3164039c36d3315e0c7f0
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.19.2/cmake-3.19.2.tar.gz
-  # "3.19.3":
-  #   sha256: 3faca7c131494a1e34d66e9f8972ff5369e48d419ea8ceaa3dc15b4c11367732
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.19.3/cmake-3.19.3.tar.gz
-  # "3.19.4":
-  #   sha256: 7d0232b9f1c57e8de81f38071ef8203e6820fe7eec8ae46a1df125d88dbcc2e1
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.19.4/cmake-3.19.4.tar.gz
-  # "3.19.5":
-  #   sha256: c432296eb5dec6d71eae15d140f6297d63df44e9ffe3e453628d1dc8fc4201ce
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.19.5/cmake-3.19.5.tar.gz
-  # "3.19.6":
-  #   sha256: ec87ab67c45f47c4285f204280c5cde48e1c920cfcfed1555b27fb3b1a1d20ba
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.19.6/cmake-3.19.6.tar.gz
-  # "3.19.7":
-  #   sha256: 58a15f0d56a0afccc3cc5371234fce73fcc6c8f9dbd775d898e510b83175588e
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.19.7/cmake-3.19.7.tar.gz
   "3.19.8":
-    sha256: 09b4fa4837aae55c75fb170f6a6e2b44818deba48335d1969deddfbb34e30369
     url: https://github.com/Kitware/CMake/releases/download/v3.19.8/cmake-3.19.8.tar.gz
-  # "3.20.0":
-  #   sha256: 9c06b2ddf7c337e31d8201f6ebcd3bba86a9a033976a9aee207fe0c6971f4755
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0.tar.gz
-  # "3.20.1":
-  #   sha256: 3f1808b9b00281df06c91dd7a021d7f52f724101000da7985a401678dfe035b0
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.20.1/cmake-3.20.1.tar.gz
-  # "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
-  # "3.20.4":
-  #   sha256: 87a4060298f2c6bb09d479de1400bc78195a5b55a65622a7dceeb3d1090a1b16
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.20.4/cmake-3.20.4.tar.gz
-  # "3.20.5":
-  #   sha256: 12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.20.5/cmake-3.20.5.tar.gz
+    sha256: 09b4fa4837aae55c75fb170f6a6e2b44818deba48335d1969deddfbb34e30369
   "3.20.6":
-    sha256: a0bd485e1a38dd13c0baec89d5f4adbf61c7fd32fddb38eabc69a75bc0b65d72
     url: https://github.com/Kitware/CMake/releases/download/v3.20.6/cmake-3.20.6.tar.gz
-  # "3.21.0":
-  #   sha256: 4a42d56449a51f4d3809ab4d3b61fd4a96a469e56266e896ce1009b5768bd2ab
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.21.0/cmake-3.21.0.tar.gz
-  # "3.21.1":
-  #   sha256: fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1.tar.gz
-  # "3.21.2":
-  #   sha256: 94275e0b61c84bb42710f5320a23c6dcb2c6ee032ae7d2a616f53f68b3d21659
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.21.2/cmake-3.21.2.tar.gz
-  # "3.21.3":
-  #   sha256: d14d06df4265134ee42c4d50f5a60cb8b471b7b6a47da8e5d914d49dd783794f
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.21.3/cmake-3.21.3.tar.gz
-  # "3.21.4":
-  #   sha256: d9570a95c215f4c9886dd0f0564ca4ef8d18c30750f157238ea12669c2985978
-  #   url: https://github.com/Kitware/CMake/releases/download/v3.21.4/cmake-3.21.4.tar.gz
-  "3.21.5":
-    sha256: c73587b5ab827d56c09f0a1e256b12743ff200495e31fc9686f2b9dc8a28897f
-    url: https://github.com/Kitware/CMake/releases/download/v3.21.5/cmake-3.21.5.tar.gz
-  "3.21.6":
-    sha256: b7c3ac35ca7ed3cce8c192c9c873e6061aaecc8b2bc564290e629b10bff59f3c
-    url: https://github.com/Kitware/CMake/releases/download/v3.21.6/cmake-3.21.6.tar.gz
-  "3.22.0":
-    sha256: 998c7ba34778d2dfdb3df8a695469e24b11e2bfa21fbe41b361a3f45e1c9345e
-    url: https://github.com/Kitware/CMake/releases/download/v3.22.0/cmake-3.22.0.tar.gz
-  "3.22.1":
-    sha256: 0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0
-    url: https://github.com/Kitware/CMake/releases/download/v3.22.1/cmake-3.22.1.tar.gz
-  "3.22.2":
-    sha256: 3c1c478b9650b107d452c5bd545c72e2fad4e37c09b89a1984b9a2f46df6aced
-    url: https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2.tar.gz
-  "3.22.3":
-    sha256: 9f8469166f94553b6978a16ee29227ec49a2eb5ceb608275dec40d8ae0d1b5a0
-    url: https://github.com/Kitware/CMake/releases/download/v3.22.3/cmake-3.22.3.tar.gz
+    sha256: a0bd485e1a38dd13c0baec89d5f4adbf61c7fd32fddb38eabc69a75bc0b65d72
+  "3.21.7":
+    url: https://github.com/Kitware/CMake/releases/download/v3.21.7/cmake-3.21.7.tar.gz
+    sha256: 3523c4a5afc61ac3d7c92835301cdf092129c9b672a6ee17e68c92e928c1375a
+  "3.22.6":
+    url: https://github.com/Kitware/CMake/releases/download/v3.22.6/cmake-3.22.6.tar.gz
+    sha256: 73933163670ea4ea95c231549007b0c7243282293506a2cf4443714826ad5ec3
+  "3.23.5":
+    url: "https://github.com/Kitware/CMake/releases/download/v3.23.5/cmake-3.23.5.tar.gz"
+    sha256: "f2944cde7a140b992ba5ccea2009a987a92413762250de22ebbace2319a0f47d"
+  "3.24.3":
+    url: "https://github.com/Kitware/CMake/releases/download/v3.24.3/cmake-3.24.3.tar.gz"
+    sha256: "b53aa10fa82bff84ccdb59065927b72d3bee49f4d86261249fc0984b3b367291"
+  "3.25.0":
+    url: "https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0.tar.gz"
+    sha256: "306463f541555da0942e6f5a0736560f70c487178b9d94a5ae7f34d0538cdd48"