diff options
| author | Stephane Lajoie <dada@typicus.org> | 2017-07-07 22:30:36 -0400 |
|---|---|---|
| committer | Stephane Lajoie <dada@typicus.org> | 2017-07-07 22:30:36 -0400 |
| commit | c2f1a2af59d911b79dbe63a23815c4bfa472e2a6 (patch) | |
| tree | 90cc452ce24b3981e0653ae956f77fbfd4b05b1a /ports/grpc | |
| parent | b5cd10bc66b785fdc385c16cfddc503324ba8e53 (diff) | |
| parent | 426df16b57c325928e6d587dc385dc836712a6b1 (diff) | |
| download | vcpkg-c2f1a2af59d911b79dbe63a23815c4bfa472e2a6.tar.gz vcpkg-c2f1a2af59d911b79dbe63a23815c4bfa472e2a6.zip | |
Merge branch 'master' into add-llvm
Diffstat (limited to 'ports/grpc')
| -rw-r--r-- | ports/grpc/CONTROL | 2 | ||||
| -rw-r--r-- | ports/grpc/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/grpc/revert-c019e05.patch | 18 |
3 files changed, 23 insertions, 3 deletions
diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index 8298a047c..d9654cddf 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,4 +1,4 @@ Source: grpc -Version: 1.4.0 +Version: 1.4.1 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 3397e86dc..e26c758d0 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.4.0 - SHA512 183254e62604bae0ef8b97c3cda9718ec7ac03a1f29e29ecc582adf670d07ee177ae1ad92ffc042f8b12715f3afa8a0e4db34f88b826fe307249fd6eb7efd249 + REF v1.4.1 + SHA512 5028e4f881a41e4c4ddf770bd824d1d5de825f86d68dbbfab22e2a34ec0e46b27754b0f5b40cfc02b0d22a756b08056b100837b590745b5fdbdce9a803e59f8d HEAD_REF master ) @@ -21,6 +21,7 @@ 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 ) @@ -60,6 +61,7 @@ file(GLOB TOOLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.exe") if(TOOLS) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/grpc) file(COPY ${TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/grpc) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/grpc) endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) diff --git a/ports/grpc/revert-c019e05.patch b/ports/grpc/revert-c019e05.patch new file mode 100644 index 000000000..afb5cfa71 --- /dev/null +++ b/ports/grpc/revert-c019e05.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b7555b1bc3..edbffea76c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14204,6 +14204,13 @@ 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 + ${_config}.cmake @ONLY) |