diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-12-14 17:00:47 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-01-09 12:27:19 -0800 |
| commit | bb1bb1c94a72b891883efa6522791620ef3bbc0f (patch) | |
| tree | 841552caea8bf21ff6a7dc66c62e8e00063bb437 /ports/protobuf | |
| parent | 11286693b0745dc97246170e06d9e1547a8ce0fd (diff) | |
| download | vcpkg-bb1bb1c94a72b891883efa6522791620ef3bbc0f.tar.gz vcpkg-bb1bb1c94a72b891883efa6522791620ef3bbc0f.zip | |
Updates 2018.12.14
Diffstat (limited to 'ports/protobuf')
| -rw-r--r-- | ports/protobuf/CONTROL | 2 | ||||
| -rw-r--r-- | ports/protobuf/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/protobuf/version-rc-msvc.patch | 16 |
3 files changed, 20 insertions, 3 deletions
diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL index c2be8e0f3..89719093c 100644 --- a/ports/protobuf/CONTROL +++ b/ports/protobuf/CONTROL @@ -1,5 +1,5 @@ Source: protobuf -Version: 3.6.1-4 +Version: 3.6.1.3 Description: Protocol Buffers - Google's data interchange format Feature: zlib diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 1dc7e6cf5..31f1b3819 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -3,12 +3,13 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/protobuf - REF v3.6.1 - SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839 + REF v3.6.1.3 + SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e 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") diff --git a/ports/protobuf/version-rc-msvc.patch b/ports/protobuf/version-rc-msvc.patch new file mode 100644 index 000000000..b24a862d9 --- /dev/null +++ b/ports/protobuf/version-rc-msvc.patch @@ -0,0 +1,16 @@ +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)
|