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

[vcpkg-tools] update cmake and git (windows only) #22985

Merged
merged 29 commits into from
Feb 26, 2022
Merged

[vcpkg-tools] update cmake and git (windows only) #22985

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
29 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
bc1ce81
Merge remote-tracking branch 'cenit/dev/cenit/cmake322' into cmake_up…
Neumann-A Feb 7, 2022
ac921e5
update test port
Neumann-A Feb 7, 2022
f49011a
update cmake to 3.22.2
Neumann-A Feb 7, 2022
a042f4e
fix missing uuid on osx in ignition-transport.
Neumann-A Feb 7, 2022
428f78c
modernize
Neumann-A Feb 7, 2022
ea1996a
fix hash
Neumann-A Feb 7, 2022
0c7e5f7
fix qtbase regression
Neumann-A Feb 7, 2022
5c00b62
try fixing the pc file search
Neumann-A Feb 8, 2022
5ba5710
hidaoi give trace logs
Neumann-A Feb 8, 2022
04c06a2
give me trace output
Neumann-A Feb 8, 2022
37db851
bit of pkgconf changes. Need system search paths for pkgconf to work …
Neumann-A Feb 8, 2022
608af50
fix underscore
Neumann-A Feb 8, 2022
f26c927
remove extra x
Neumann-A Feb 8, 2022
b411bcc
Merge remote-tracking branch 'upstream/master' into cmake_update_3.22.2
Neumann-A Feb 24, 2022
b106059
revert port changes
Neumann-A Feb 24, 2022
25030ab
add license to cmake test port
Neumann-A Feb 24, 2022
4d6220f
fix arm regression due to not finding taglib.
Feb 25, 2022
fdc0716
version stuff
Feb 25, 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
2 changes: 1 addition & 1 deletion scripts/test_ports/cmake/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vcpkg_from_gitlab(
OUT_SOURCE_PATH SOURCE_PATH
REPO cmake/cmake
REF
b7b0fb430397bafae4a7bd80b41d474c91a3b7f3
8428e39ed9cddb3b7f1a6f7a58cb8617503183d2
SHA512
3b0de26910bceaf4bc6546255bada4c502cd0fd32f44bc28b067f347c09d028c175a3243551bbe4bb64bcf312df9ff827e8fdbcb0b34a12e1ce4a26ba0799ee2
HEAD_REF master
Expand Down
3 changes: 1 addition & 2 deletions scripts/test_ports/cmake/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "cmake",
"version-string": "3.20.0",
"port-version": 1,
"version-string": "3.22.2",
"description": "CMake is an open-source, cross-platform family of tools designed to build, test and package software.",
"homepage": "https://cmake.org/",
"dependencies": [
Expand Down
38 changes: 19 additions & 19 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.1-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.2</version>
<exeRelativePath>cmake-3.22.2-windows-i386\bin\cmake.exe</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-windows-i386.zip</url>
<sha512>969d3d58d56d8fa3cc3acae2b949bf58abab945f70ae292ff20c9060d845dfc094c613c367a924abff47f307cc33af1467cdb9b75bb857868e38b2c7cdc72f79</sha512>
<archiveName>cmake-3.22.2-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.2</version>
<exeRelativePath>cmake-3.22.2-macos-universal/CMake.app/Contents/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-macos-universal.tar.gz</url>
<sha512>08104f608ecb9a5cfef38e79f0957d21e425616c0677781445492f82cbfec805113e3b5eb4bc737b707bb26a00678e7bd55e17555a5611c08b0b9b44ac5136ac</sha512>
<archiveName>cmake-3.22.2-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.2</version>
<exeRelativePath>cmake-3.22.2-linux-x86_64/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-x86_64.tar.gz</url>
<sha512>579e08b086f6903ef063697fca1dc2692f68a7341dd35998990b772b4221cdb5b1deecfa73bad9d46817ef09e58882b2adff9d64f959c01002c11448a878746b</sha512>
<archiveName>cmake-3.22.2linux-x86_64.tar.gz</archiveName>
</tool>
<tool name="cmake" os="freebsd">
<version>3.20.4</version>
Expand All @@ -36,11 +36,11 @@
<archiveName>cmake-3.20.4.txz</archiveName>
</tool>
<tool name="git" os="windows">
<version>2.32.0.2</version>
<version>2.35.1.2</version>
<exeRelativePath>mingw32\bin\git.exe</exeRelativePath>
<url>https://github.com/git-for-windows/git/releases/download/v2.32.0.windows.2/PortableGit-2.32.0.2-32-bit.7z.exe</url>
<sha512>867d8534972cbaf7a4224e25a14d484f8d17ef186f8d79e9a758afb90cf69541375cb7615a39702311f4809cb8371ef85c2b1a15bfffe9e48f0e597ac011b348</sha512>
<archiveName>PortableGit-2.32.0.2-32-bit.7z.exe</archiveName>
<url>https://github.com/git-for-windows/git/releases/download/v2.35.1.windows.2/PortableGit-2.35.1.2-32-bit.7z.exe</url>
<sha512>f98df16641a615bbc36c5c319c78abb780d824ff35ed5f2a095e2d5fce2acacfc7f6532c96f1c81d3d3cd8a642858cbd9de0e0e5fcde9ca11e6ad9f6598bb82f</sha512>
<archiveName>PortableGit-2.35.1.2-32-bit.7z.exe</archiveName>
</tool>
<tool name="git" os="linux">
<version>2.7.4</version>
Expand Down