[protozero] update to 1.7.1 (#24231)

This commit is contained in:
autoantwort 2022-04-19 17:17:40 +02:00 committed by GitHub
parent 5eeffb9036
commit 03de4e9edc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 31 additions and 23 deletions

View File

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9702d6..bd41cbe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ if(MSVC)
add_definitions(/W3)
add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
else()
- add_definitions(-std=c++11 -Wall -Wextra -pedantic -Wsign-compare -Wunused-parameter -Wno-float-equal -Wno-covered-switch-default)
+ add_definitions(-std=c++17 -Wall -Wextra -pedantic -Wsign-compare -Wunused-parameter -Wno-float-equal -Wno-covered-switch-default)
if(WERROR)
add_definitions(-Werror)
endif()

View File

@ -0,0 +1,17 @@
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Wed, 16 Feb 2022 00:11:38 +0100
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b975d490..df2ca15f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,9 @@ endif()
#
#-----------------------------------------------------------------------------
-find_package(Protobuf)
+if(BUILD_TESTING)
+ find_package(Protobuf)
+endif()
#-----------------------------------------------------------------------------

View File

@ -2,15 +2,16 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mapbox/protozero
SHA512 d09a34865c535264c52f9c605ccb6f453c357f5e3a7b0dc72b097de288eabc6985a5b81ddbe79c47d0af2d8f74e33bd380fefce47acb15d8d51d5c151d71786b
REF v1.7.0
SHA512 90bf1f487efa0ad9da2f3b887b7a6dbd849fa3687dd2126c324f902a8584722f4f7d4a2ea86f6a0e75999f7be829f6ae26cad9df1cae55d0b29a9ec24a4dbfd2
REF v1.7.1
HEAD_REF master
PATCHES fix-builderror.patch
PATCHES
fix-no-tests.patch # from https://github.com/mapbox/protozero/pull/110
)
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTING=OFF
)

View File

@ -1,10 +1,10 @@
{
"name": "protozero",
"version-semver": "1.7.0",
"port-version": 1,
"version-semver": "1.7.1",
"description": "Minimalist protocol buffer decoder and encoder in C++",
"homepage": "https://github.com/mapbox/protozero",
"license": "BSD-2-Clause",
"supports": "!uwp",
"dependencies": [
"protobuf",
{

View File

@ -1356,8 +1356,6 @@ ctp:x64-windows=skip
ctp:x64-windows-static=skip
ctp:x64-windows-static-md=skip
ctp:x86-windows=skip
protozero:arm-uwp=fail
protozero:x64-uwp=fail
# clapack is replaced by lapack-reference on the platforms lapack-reference supports
clapack:x64-linux=skip

View File

@ -5577,8 +5577,8 @@
"port-version": 1
},
"protozero": {
"baseline": "1.7.0",
"port-version": 1
"baseline": "1.7.1",
"port-version": 0
},
"proxygen": {
"baseline": "2022.03.21.00",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f6fa6a99279f9efb98bafc45707a1bcf9ef690e4",
"version-semver": "1.7.1",
"port-version": 0
},
{
"git-tree": "e617bcd5ceeebd89da7229c7daeecacf7581d767",
"version-semver": "1.7.0",