diff options
| author | Arkady Shapkin <arkady.shapkin@gmail.com> | 2017-09-07 14:56:04 +0300 |
|---|---|---|
| committer | Arkady Shapkin <arkady.shapkin@gmail.com> | 2017-09-07 22:16:39 +0300 |
| commit | cccbdacc47a27d103fe250a05de5f14ec5fa5161 (patch) | |
| tree | 46474596743624cc60dc1d52e5b095e921f607ac /ports/grpc/disable-csharp-ext.patch | |
| parent | 1a178574df7aaa8fbd84f11da175d23a7d68c287 (diff) | |
| download | vcpkg-cccbdacc47a27d103fe250a05de5f14ec5fa5161.tar.gz vcpkg-cccbdacc47a27d103fe250a05de5f14ec5fa5161.zip | |
[grpc] Update version to 1.6.0
Diffstat (limited to 'ports/grpc/disable-csharp-ext.patch')
| -rw-r--r-- | ports/grpc/disable-csharp-ext.patch | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/ports/grpc/disable-csharp-ext.patch b/ports/grpc/disable-csharp-ext.patch index 6cb9090ab..3b887c8b4 100644 --- a/ports/grpc/disable-csharp-ext.patch +++ b/ports/grpc/disable-csharp-ext.patch @@ -1,31 +1,29 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c85a20a..99b2897 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3694,6 +3694,7 @@ target_link_libraries(qps +--- a/CMakeLists.txt Tue Aug 29 22:24:15 2017 ++++ b/CMakeLists.txt Mon Sep 04 00:43:56 2017 +@@ -4574,6 +4574,8 @@ endif (gRPC_BUILD_TESTS) +option(gRPC_INSTALL_CSHARP_EXT "" ON) ++ add_library(grpc_csharp_ext SHARED src/csharp/ext/grpc_csharp_ext.c ) -@@ -3702,7 +3703,7 @@ if(WIN32 AND MSVC) +@@ -4582,7 +4584,7 @@ set_target_properties(grpc_csharp_ext PROPERTIES COMPILE_PDB_NAME "grpc_csharp_ext" COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) - if (gRPC_INSTALL) + if (gRPC_INSTALL AND gRPC_INSTALL_CSHARP_EXT) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_csharp_ext.pdb - DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL + DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL ) -@@ -3728,8 +3729,7 @@ target_link_libraries(grpc_csharp_ext - ) +@@ -4613,7 +4615,7 @@ + -- -if (gRPC_INSTALL) +if (gRPC_INSTALL AND gRPC_INSTALL_CSHARP_EXT) install(TARGETS grpc_csharp_ext EXPORT gRPCTargets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} |