[protobuf] Update to 3.7.1 (#5502)

* [protobuf] Update to 3.7.1
This commit is contained in:
myd7349 2019-03-29 06:44:02 +08:00 committed by Phil Christensen
parent 6e25f7e02a
commit 9f39409a34
4 changed files with 11 additions and 28 deletions

View File

@ -1,5 +1,5 @@
Source: protobuf
Version: 3.6.1.3-1
Version: 3.7.1
Description: Protocol Buffers - Google's data interchange format
Feature: zlib

View File

@ -1,11 +1,11 @@
diff --git a/cmake/install.cmake b/cmake/install.cmake
index 82036cb..378db2d 100644
index 9b2ae93c..7c9670a3 100644
--- a/cmake/install.cmake
+++ b/cmake/install.cmake
@@ -15,10 +15,12 @@ foreach(_library ${_protobuf_libraries})
PROPERTY INTERFACE_INCLUDE_DIRECTORIES
$<BUILD_INTERFACE:${protobuf_source_dir}/src>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
@@ -22,10 +22,12 @@ foreach(_library ${_protobuf_libraries})
set_property(TARGET ${_library}
PROPERTY INSTALL_RPATH "@loader_path")
endif()
+ if(NOT "${_library}" STREQUAL "libprotobuf-lite")
install(TARGETS ${_library} EXPORT protobuf-targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${_library}
@ -15,8 +15,8 @@ index 82036cb..378db2d 100644
endforeach()
if (protobuf_BUILD_PROTOC_BINARIES)
@@ -26,7 +28,7 @@ if (protobuf_BUILD_PROTOC_BINARIES)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc)
@@ -40,7 +42,7 @@ if (protobuf_BUILD_PROTOC_BINARIES)
endif()
endif (protobuf_BUILD_PROTOC_BINARIES)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/protobuf.pc ${CMAKE_CURRENT_BINARY_DIR}/protobuf-lite.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
@ -24,7 +24,7 @@ index 82036cb..378db2d 100644
file(STRINGS extract_includes.bat.in _extract_strings
REGEX "^copy")
@@ -107,12 +109,12 @@ configure_file(protobuf-options.cmake
@@ -121,12 +123,12 @@ configure_file(protobuf-options.cmake
# Allows the build directory to be used as a find directory.
if (protobuf_BUILD_PROTOC_BINARIES)

View File

@ -3,13 +3,12 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/protobuf
REF v3.6.1.3
SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e
REF v3.7.1
SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
HEAD_REF master
PATCHES
fix-uwp.patch
disable-lite.patch
version-rc-msvc.patch
)
if(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x86")

View File

@ -1,16 +0,0 @@
diff --git a/cmake/protoc.cmake b/cmake/protoc.cmake
index 9bf6f5a..b58a12a 100644
--- a/cmake/protoc.cmake
+++ b/cmake/protoc.cmake
@@ -2,9 +2,11 @@ set(protoc_files
${protobuf_source_dir}/src/google/protobuf/compiler/main.cc
)
+if(MSVC)
set(protoc_rc_files
${CMAKE_CURRENT_BINARY_DIR}/version.rc
)
+endif()
add_executable(protoc ${protoc_files} ${protoc_rc_files})
target_link_libraries(protoc libprotobuf libprotoc)