diff options
| author | Arkadiy Shapkin <arkady.shapkin@gmail.com> | 2017-05-10 23:08:31 +0300 |
|---|---|---|
| committer | Arkadiy Shapkin <arkady.shapkin@gmail.com> | 2017-05-11 14:44:14 +0300 |
| commit | 7759a557cbc798be00cc7e1a792bb055c1af49dc (patch) | |
| tree | c71e8f8a7d7147c650cc0a3c695bca789c14c00e | |
| parent | 083bfa14b0dd1481e08e1c6424dadd090fbb8bad (diff) | |
| download | vcpkg-7759a557cbc798be00cc7e1a792bb055c1af49dc.tar.gz vcpkg-7759a557cbc798be00cc7e1a792bb055c1af49dc.zip | |
[grpc] Update to version 1.3.1
| -rw-r--r-- | ports/grpc/CONTROL | 4 | ||||
| -rw-r--r-- | ports/grpc/portfile.cmake | 20 |
2 files changed, 20 insertions, 4 deletions
diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index ee0c257de..3b2df7d1f 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,4 +1,4 @@ Source: grpc -Version: 1.2.3-1 -Build-Depends: zlib, openssl, protobuf +Version: 1.3.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 80cdd480f..816dff17c 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -2,6 +2,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) message(STATUS "Warning: Dynamic building not supported yet. Building static.") set(VCPKG_LIBRARY_LINKAGE static) endif() + include(vcpkg_common_functions) if(EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git") @@ -11,27 +12,42 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF v1.2.3 - SHA512 51e3c2f866fcac861ca007dd022373e63f82c63754001d1182ea14dd2eff2dfba325f8bc130ddf94e4ae35e23299ca337a6c5c6a9cee145f9e5c79e4c46af280 + REF v1.3.1 + SHA512 1c9f35e84995158b75bb8694bb9d8c5ddafccf347c4827213290b221f9fc3ab9071c9f79a10a563e9cdfabae3f4b83d6148907f106066f54093242f818038438 HEAD_REF master ) +# Issue: https://github.com/grpc/grpc/issues/10759 vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/revert-c019e05.patch ) +if(VCPKG_CRT_LINKAGE STREQUAL static) + set(gRPC_MSVC_STATIC_RUNTIME ON) +else() + set(gRPC_MSVC_STATIC_RUNTIME OFF) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DgRPC_INSTALL=ON + -DgRPC_BUILD_TESTS=OFF + -DgRPC_MSVC_STATIC_RUNTIME=${gRPC_MSVC_STATIC_RUNTIME} -DgRPC_ZLIB_PROVIDER=package -DgRPC_SSL_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package + -DgRPC_CARES_PROVIDER=package + -DgRPC_GFLAGS_PROVIDER=none + -DgRPC_BENCHMARK_PROVIDER=none -DCMAKE_INSTALL_CMAKEDIR=share/grpc ) +# gRPC runs built executables during the build, so they need access to the installed DLLs. +set(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin;${CURRENT_INSTALLED_DIR}/debug/bin") + vcpkg_install_cmake() vcpkg_fixup_cmake_targets() |