Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update cmake to 3.22.1 #21456

Closed
wants to merge 11 commits into from
Closed

Update cmake to 3.22.1 #21456

Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6940916
update cmake to 3.22.0-rc3 to verify catalogue compatibility and be r…
cenit Nov 16, 2021
519edab
update to cmake 3.22 final release
cenit Nov 19, 2021
0df6505
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Nov 24, 2021
9385e92
Merge branch 'master' into dev/cenit/cmake322
cenit Nov 29, 2021
2674173
Merge branch 'master' into dev/cenit/cmake322
cenit Dec 9, 2021
0e6529b
[vcpkgTools] update to cmake 3.22.1
cenit Dec 9, 2021
b1e8f5e
Merge branch 'microsoft:master' into dev/cenit/cmake322
cenit Dec 11, 2021
ee14b84
Merge branch 'master' into dev/cenit/cmake322
cenit Dec 17, 2021
f006d50
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Dec 29, 2021
cdad3c5
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Jan 12, 2022
969ba7e
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions scripts/vcpkgTools.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@
<archiveName>python-3.10.0-embed-win32.zip</archiveName>
</tool>
<tool name="cmake" os="windows">
<version>3.21.1</version>
<exeRelativePath>cmake-3.21.1-windows-i386\bin\cmake.exe</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-windows-i386.zip</url>
<sha512>3aa0e9c904bf8abfc9441c1f0fd571e613ade7bc12f36211cd9006b4a2226552815ec8b00c8ef43583769d9d90996e75d2e832b3718ac3b85d3f9fb4db1cd60a</sha512>
<archiveName>cmake-3.21.1-windows-i386.zip</archiveName>
<version>3.22.0</version>
<exeRelativePath>cmake-3.22.0-windows-i386\bin\cmake.exe</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.22.0/cmake-3.22.0-windows-i386.zip</url>
<sha512>452271c8060ceeb3f80dc5ce3c974fbafaea6f90d287a87fb1de5b45aec288dcaccaf4ee325ffb4a3c440ccd6a08085789af6a15480e752f8d68633fc3e8c840</sha512>
<archiveName>cmake-3.22.0-windows-i386.zip</archiveName>
</tool>
<tool name="cmake" os="osx">
<version>3.21.1</version>
<exeRelativePath>cmake-3.21.1-macos-universal/CMake.app/Contents/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-macos-universal.tar.gz</url>
<sha512>0e5d3781101d6f54d916066719a0ff27d052b40e999dfd8e1f53d8d22d99e45cad22fc28b5d2a9e810b0cc8237e640d7747aff2a2c0896571c8a69ecdd0a9e41</sha512>
<archiveName>cmake-3.21.1-macos-universal.tar.gz</archiveName>
<version>3.22.0</version>
<exeRelativePath>cmake-3.22.0-macos-universal/CMake.app/Contents/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.22.0/cmake-3.22.0-macos-universal.tar.gz</url>
<sha512>e23d0326ab80a8dc509cb7f4cfe50276f9520f06c8521d6979cb21cd4cf1c55bdc0156a33d02cfc53d07935615b578a0ca98eaa53a44c548e2984b8b7dd4d084</sha512>
<archiveName>cmake-3.22.0-macos-universal.tar.gz</archiveName>
</tool>
<tool name="cmake" os="linux">
<version>3.21.1</version>
<exeRelativePath>cmake-3.21.1-linux-x86_64/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-Linux-x86_64.tar.gz</url>
<sha512>deb24087315bcf01d2969846246564a352b6f77521df6b235f9ef525450db9c89b32dca4ad78f93a356dd5ab7b587374d49fc1a892354760715a5ef1f88e925f</sha512>
<archiveName>cmake-3.21.1-linux-x86_64.tar.gz</archiveName>
<version>3.22.0</version>
<exeRelativePath>cmake-3.22.0-linux-x86_64/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.22.0/cmake-3.22.0-linux-x86_64.tar.gz</url>
<sha512>048798c82890f79906e4e1a78f8494c30e0d2cec1a678d30b1e40e6684243d07512fae55e20e3e730d4d2ecaecfaa2b375e48f84c4f751861615ce94c8297b16</sha512>
<archiveName>cmake-3.22.0-linux-x86_64.tar.gz</archiveName>
</tool>
<tool name="cmake" os="freebsd">
<version>3.20.4</version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that freebsd is still on CMake 3.20.4 here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't do anything about this, because the upstream does not continue to provide freebsd versions.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So vcpkg bootstrap is to download a version which is incompatible with vcpkg?

Expand Down