aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJozef Izso <jozef.izso@gmail.com>2017-06-23 13:49:56 +0200
committerJozef Izso <jozef.izso@gmail.com>2017-06-23 14:52:26 +0200
commitb0b186643c0ae0bc268bbf4ec2adeeb81c953004 (patch)
treef25edf0124303e0b7c96315b4e1ae5fef0cfbde8
parentdf3f73d8256e549ad43efd0a84cd3691d91c9c10 (diff)
downloadvcpkg-b0b186643c0ae0bc268bbf4ec2adeeb81c953004.tar.gz
vcpkg-b0b186643c0ae0bc268bbf4ec2adeeb81c953004.zip
grpc 1.4.0
-rw-r--r--ports/grpc/CONTROL2
-rw-r--r--ports/grpc/portfile.cmake5
-rw-r--r--ports/grpc/revert-c019e05.patch18
3 files changed, 3 insertions, 22 deletions
diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL
index 47290a0d3..8298a047c 100644
--- a/ports/grpc/CONTROL
+++ b/ports/grpc/CONTROL
@@ -1,4 +1,4 @@
Source: grpc
-Version: 1.3.1-1
+Version: 1.4.0
Build-Depends: zlib, openssl, protobuf, c-ares
Description: An RPC library and framework \ No newline at end of file
diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake
index 10e79cd55..3397e86dc 100644
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@@ -12,8 +12,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO grpc/grpc
- REF v1.3.1
- SHA512 1c9f35e84995158b75bb8694bb9d8c5ddafccf347c4827213290b221f9fc3ab9071c9f79a10a563e9cdfabae3f4b83d6148907f106066f54093242f818038438
+ REF v1.4.0
+ SHA512 183254e62604bae0ef8b97c3cda9718ec7ac03a1f29e29ecc582adf670d07ee177ae1ad92ffc042f8b12715f3afa8a0e4db34f88b826fe307249fd6eb7efd249
HEAD_REF master
)
@@ -21,7 +21,6 @@ vcpkg_from_github(
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
- ${CMAKE_CURRENT_LIST_DIR}/revert-c019e05.patch
${CMAKE_CURRENT_LIST_DIR}/disable-csharp-ext.patch
)
diff --git a/ports/grpc/revert-c019e05.patch b/ports/grpc/revert-c019e05.patch
deleted file mode 100644
index 77c501f77..000000000
--- a/ports/grpc/revert-c019e05.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e09f729..c85a20a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11847,7 +11847,12 @@ endif (gRPC_BUILD_TESTS)
-
-
-
--
-+if (gRPC_INSTALL)
-+ install(EXPORT gRPCTargets
-+ DESTINATION ${CMAKE_INSTALL_CMAKEDIR}
-+ NAMESPACE gRPC::
-+ )
-+endif()
-
- foreach(_config gRPCConfig gRPCConfigVersion)
- configure_file(tools/cmake/${_config}.cmake.in