From cc63dc0f664a5ee2fb1cf0418231b7ad28265650 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Sun, 15 Jan 2023 20:04:04 +0100 Subject: [PATCH] Update cmake to 3.25.1 (#28522) * Update cmake to 3.25.1 * [libphonenumber] fix finding of protobuf * Add zeroc-ice:x64-windows-static-md=fail Co-authored-by: FrankXie Co-authored-by: Cheney-Wang <850426846@qq.com> --- ports/libphonenumber/fix-find-protobuf.patch | 12 ++++++++ ports/libphonenumber/portfile.cmake | 1 + ports/libphonenumber/vcpkg.json | 1 + scripts/ci.baseline.txt | 1 + scripts/ports.cmake | 2 +- scripts/vcpkgTools.xml | 30 ++++++++++---------- versions/baseline.json | 2 +- versions/l-/libphonenumber.json | 5 ++++ 8 files changed, 37 insertions(+), 17 deletions(-) create mode 100644 ports/libphonenumber/fix-find-protobuf.patch diff --git a/ports/libphonenumber/fix-find-protobuf.patch b/ports/libphonenumber/fix-find-protobuf.patch new file mode 100644 index 0000000000..19055f6df7 --- /dev/null +++ b/ports/libphonenumber/fix-find-protobuf.patch @@ -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) diff --git a/ports/libphonenumber/portfile.cmake b/ports/libphonenumber/portfile.cmake index 02e199e66c..11c160da12 100644 --- a/ports/libphonenumber/portfile.cmake +++ b/ports/libphonenumber/portfile.cmake @@ -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( diff --git a/ports/libphonenumber/vcpkg.json b/ports/libphonenumber/vcpkg.json index 073a2451bf..18715566a8 100644 --- a/ports/libphonenumber/vcpkg.json +++ b/ports/libphonenumber/vcpkg.json @@ -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", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index b501d6e64a..e69ae6c2de 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -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 diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 4c3b9304b3..c9bb4eda08 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -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) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 9c09730c87..a94aaa57a6 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -15,25 +15,25 @@ python-3.10.7.nupkg.zip - 3.25.0 - cmake-3.25.0-windows-i386\bin\cmake.exe - https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-windows-i386.zip - 6ef267b117af3369a72186f1c892e8f112b8013899f4b7a6573ea0d678b2ac41e84adb760ca793ebafa37852dfb9e7e1bc40d14f73ebb4cfedae9ab2f504b417 - cmake-3.25.0-windows-i386.zip + 3.25.1 + cmake-3.25.1-windows-i386\bin\cmake.exe + https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-windows-i386.zip + 4a84abdb53781178a99046aa09cf6a6b2bfe159d6b6bbdd2449839d2f50b872b4cc783c44774343b6122ec9400bcfdec65fffd4a246575ba55d178bc180f6adc + cmake-3.25.1-windows-i386.zip - 3.25.0 - cmake-3.25.0-macos-universal/CMake.app/Contents/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-macos-universal.tar.gz - d37017c8917e284d1102e42dc3dcd5f0c956f70720b357a530766980f7b2c595c02d273dfb7d5a01bc6f7680bff6742354f528a49033f43b9b1ee7d8ad863f0f - cmake-3.25.0-macos-universal.tar.gz + 3.25.1 + cmake-3.25.1-macos-universal/CMake.app/Contents/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-macos-universal.tar.gz + 6009ff799ee516c1ca3bf3a31bacdd59fc48f772a03c822f49e1e9b6a6582e64d75c6005a90574539d61b7094dfe36bfe4b4c1560a4fb7d1287be472c0fd146a + cmake-3.25.1-macos-universal.tar.gz - 3.25.0 - cmake-3.25.0-linux-x86_64/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-linux-x86_64.tar.gz - fe59f499a6ca2c651457868ecd9c3541a3c9bcdfaef0e5b4ca18a9fb3eb12c097a19564333342f853b2b7ddef173128090baa4774c46cb8ee639b4fe7cc3add3 - cmake-3.25.0-linux-x86_64.tar.gz + 3.25.1 + cmake-3.25.1-linux-x86_64/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-linux-x86_64.tar.gz + df456fafa9e63ab0105a6355cc3f66d0567c43172fb424ba75b364f65c6da100dbb303ddd11abd68b42b3b52a90805dfda36aae2468c64c204446f4befda0c78 + cmake-3.25.1-linux-x86_64.tar.gz 3.20.4 diff --git a/versions/baseline.json b/versions/baseline.json index b8072fa976..6b2fae01fa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4170,7 +4170,7 @@ }, "libphonenumber": { "baseline": "8.13.1", - "port-version": 0 + "port-version": 1 }, "libplist": { "baseline": "1.3.6", diff --git a/versions/l-/libphonenumber.json b/versions/l-/libphonenumber.json index 616ef5bd61..8a8dd57863 100644 --- a/versions/l-/libphonenumber.json +++ b/versions/l-/libphonenumber.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1576e79acd6565aa0213fdd3d4839a7575fd16a8", + "version": "8.13.1", + "port-version": 1 + }, { "git-tree": "47877baf472150729025e7198ad6aa6e6574ff5a", "version": "8.13.1",