3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 19:25:27 +08:00
Code Issues Projects Releases Wiki Activity

[protobuf] Update to 3.11.4 (#10863)

Browse Source 
* Updated protobuf to 3.11.4

* Added vcpkg_check_features to handle feature checking

* Fixed indenting in vcpkg_configure_cmake

* Replaced tabs with spaces

Co-authored-by: Vincent Paladino <vincent.paladino@zebra.com>
This commit is contained in:
Vinny 2020-04-21 16:27:19 -04:00 committed by GitHub
parent 1c3cab4405
commit 84cf4b3f83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/protobuf/CONTROL
View File

@ -1,5 +1,5 @@
Source: protobuf Source: protobuf
Version: 3.11.3 Version: 3.11.4
Homepage: https://github.com/google/protobuf Homepage: https://github.com/google/protobuf
Description: Protocol Buffers - Google's data interchange format Description: Protocol Buffers - Google's data interchange format

14
ports/protobuf/portfile.cmake
View File

@ -1,8 +1,8 @@
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO protocolbuffers/protobuf REPO protocolbuffers/protobuf
REF v3.11.3 REF v3.11.4
SHA512 beac21d495bfd8e9b40120d1db9fd82251958f954533fc6f76cd0b9c28f92533ac35368a4c298ebb1d8e09047b670ed3bd948bb7da6eb5cca7fdc0c1c44aa39b SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
HEAD_REF master HEAD_REF master
PATCHES PATCHES
fix-uwp.patch fix-uwp.patch
@ -32,11 +32,10 @@ else()
set(VCPKG_BUILD_STATIC_CRT ON) set(VCPKG_BUILD_STATIC_CRT ON)
endif() endif()
if("zlib" IN_LIST FEATURES) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
set(protobuf_WITH_ZLIB ON) zlib protobuf_WITH_ZLIB
else() )
set(protobuf_WITH_ZLIB OFF)
endif()
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/cmake SOURCE_PATH ${SOURCE_PATH}/cmake
@ -48,6 +47,7 @@ vcpkg_configure_cmake(
-Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_TESTS=OFF
-DCMAKE_INSTALL_CMAKEDIR:STRING=share/protobuf -DCMAKE_INSTALL_CMAKEDIR:STRING=share/protobuf
-Dprotobuf_BUILD_PROTOC_BINARIES=${protobuf_BUILD_PROTOC_BINARIES} -Dprotobuf_BUILD_PROTOC_BINARIES=${protobuf_BUILD_PROTOC_BINARIES}
${FEATURE_OPTIONS}
) )
vcpkg_install_cmake() vcpkg_install_cmake()