mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 04:19:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update cmake to 3.25.1 (#28522)

Browse Source 
* Update cmake to 3.25.1

* [libphonenumber] fix finding of protobuf

* Add zeroc-ice:x64-windows-static-md=fail

Co-authored-by: FrankXie <v-frankxie@microsoft.com>
Co-authored-by: Cheney-Wang <850426846@qq.com>
This commit is contained in:
autoantwort 2023-01-15 20:04:04 +01:00 committed by GitHub
parent 472ed329f5
commit cc63dc0f66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ports/libphonenumber/fix-find-protobuf.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 86f2212..46913fd 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -44,6 +44,7 @@ function (print_error DESCRIPTION FILE)
"Can't find ${DESCRIPTION}: can't locate ${FILE}. Please read the README.")
endfunction ()
+set(CMAKE_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES};lib")
# Find a library. If it has not been found, stop CMake with a fatal error
# message.
function (find_required_library NAME HEADER LIBRARY DESCRIPTION)

1
ports/libphonenumber/portfile.cmake
View File

@ -13,6 +13,7 @@ vcpkg_from_github(
"remove-build-test.patch" # Make build test a feature in future. For now, temp fix.
"remove-shared-lib.patch" # Needs -DBUILD_GEOCODER=OFF option
# Work on building shared libs in future. For now, temp fix.
fix-find-protobuf.patch
)
vcpkg_cmake_configure(

1
ports/libphonenumber/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "libphonenumber",
"version": "8.13.1",
"port-version": 1,
"description": "Google's common Java, C++ and JavaScript library for parsing, formatting, and validating international phone numbers.",
"license": "Apache-2.0",
"supports": "!linux & !osx",

1
scripts/ci.baseline.txt
View File

@ -1150,6 +1150,7 @@ dimcli:x64-windows-static=fail
zeroc-ice:x86-windows=fail
zeroc-ice:x64-windows=fail
zeroc-ice:x64-windows-static-md=fail
# ZeroC doesn't provide ARM tagets in project files.
zeroc-ice:arm64-windows=fail
zeroc-ice:arm-uwp=fail

2
scripts/ports.cmake
View File

@ -84,7 +84,7 @@ else()
set(Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL "WARNING")
endif()
vcpkg_minimum_required(VERSION 2021-11-02)
vcpkg_minimum_required(VERSION 2022-10-12)
file(TO_CMAKE_PATH "${BUILDTREES_DIR}" BUILDTREES_DIR)
file(TO_CMAKE_PATH "${PACKAGES_DIR}" PACKAGES_DIR)

30
scripts/vcpkgTools.xml
View File

@ -15,25 +15,25 @@
<archiveName>python-3.10.7.nupkg.zip</archiveName>
</tool>
<tool name="cmake" os="windows">
<version>3.25.0</version>
<exeRelativePath>cmake-3.25.0-windows-i386\bin\cmake.exe</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-windows-i386.zip</url>
<sha512>6ef267b117af3369a72186f1c892e8f112b8013899f4b7a6573ea0d678b2ac41e84adb760ca793ebafa37852dfb9e7e1bc40d14f73ebb4cfedae9ab2f504b417</sha512>
<archiveName>cmake-3.25.0-windows-i386.zip</archiveName>
<version>3.25.1</version>
<exeRelativePath>cmake-3.25.1-windows-i386\bin\cmake.exe</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-windows-i386.zip</url>
<sha512>4a84abdb53781178a99046aa09cf6a6b2bfe159d6b6bbdd2449839d2f50b872b4cc783c44774343b6122ec9400bcfdec65fffd4a246575ba55d178bc180f6adc</sha512>
<archiveName>cmake-3.25.1-windows-i386.zip</archiveName>
</tool>
<tool name="cmake" os="osx">
<version>3.25.0</version>
<exeRelativePath>cmake-3.25.0-macos-universal/CMake.app/Contents/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-macos-universal.tar.gz</url>
<sha512>d37017c8917e284d1102e42dc3dcd5f0c956f70720b357a530766980f7b2c595c02d273dfb7d5a01bc6f7680bff6742354f528a49033f43b9b1ee7d8ad863f0f</sha512>
<archiveName>cmake-3.25.0-macos-universal.tar.gz</archiveName>
<version>3.25.1</version>
<exeRelativePath>cmake-3.25.1-macos-universal/CMake.app/Contents/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-macos-universal.tar.gz</url>
<sha512>6009ff799ee516c1ca3bf3a31bacdd59fc48f772a03c822f49e1e9b6a6582e64d75c6005a90574539d61b7094dfe36bfe4b4c1560a4fb7d1287be472c0fd146a</sha512>
<archiveName>cmake-3.25.1-macos-universal.tar.gz</archiveName>
</tool>
<tool name="cmake" os="linux">
<version>3.25.0</version>
<exeRelativePath>cmake-3.25.0-linux-x86_64/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-linux-x86_64.tar.gz</url>
<sha512>fe59f499a6ca2c651457868ecd9c3541a3c9bcdfaef0e5b4ca18a9fb3eb12c097a19564333342f853b2b7ddef173128090baa4774c46cb8ee639b4fe7cc3add3</sha512>
<archiveName>cmake-3.25.0-linux-x86_64.tar.gz</archiveName>
<version>3.25.1</version>
<exeRelativePath>cmake-3.25.1-linux-x86_64/bin/cmake</exeRelativePath>
<url>https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-linux-x86_64.tar.gz</url>
<sha512>df456fafa9e63ab0105a6355cc3f66d0567c43172fb424ba75b364f65c6da100dbb303ddd11abd68b42b3b52a90805dfda36aae2468c64c204446f4befda0c78</sha512>
<archiveName>cmake-3.25.1-linux-x86_64.tar.gz</archiveName>
</tool>
<tool name="cmake" os="freebsd">
<version>3.20.4</version>

2
versions/baseline.json
View File

@ -4170,7 +4170,7 @@
},
"libphonenumber": {
"baseline": "8.13.1",
"port-version": 0
"port-version": 1
},
"libplist": {
"baseline": "1.3.6",

5
versions/l-/libphonenumber.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1576e79acd6565aa0213fdd3d4839a7575fd16a8",
"version": "8.13.1",
"port-version": 1
},
{
"git-tree": "47877baf472150729025e7198ad6aa6e6574ff5a",
"version": "8.13.1",