diff options
| author | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
|---|---|---|
| committer | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
| commit | c828f3634723996e6031fb2e3c3d1ac3f4de0cad (patch) | |
| tree | b3fe00a043d5b9351868a0d1f8aead41bb52d2be /ports/grpc/00011-fix-csharp_plugin.patch | |
| parent | 6635a2fa596ca457565eebc2a45664309cd24d77 (diff) | |
| parent | f3f329a048eaff759c1992c458f2e12351486bc7 (diff) | |
| download | vcpkg-c828f3634723996e6031fb2e3c3d1ac3f4de0cad.tar.gz vcpkg-c828f3634723996e6031fb2e3c3d1ac3f4de0cad.zip | |
Merge remote-tracking branch 'origin/master' into HEADupdate-geos-381
Diffstat (limited to 'ports/grpc/00011-fix-csharp_plugin.patch')
| -rw-r--r-- | ports/grpc/00011-fix-csharp_plugin.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ports/grpc/00011-fix-csharp_plugin.patch b/ports/grpc/00011-fix-csharp_plugin.patch index c2d177113..67450425b 100644 --- a/ports/grpc/00011-fix-csharp_plugin.patch +++ b/ports/grpc/00011-fix-csharp_plugin.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 77cf3de..8bceae6 100644
+index 48bc6cf0de..399aff7d1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1812,10 +1812,14 @@ endif()
+@@ -1854,10 +1854,14 @@ endif()
if(gRPC_BUILD_CSHARP_EXT)
@@ -18,11 +18,11 @@ index 77cf3de..8bceae6 100644 set_target_properties(grpc_csharp_ext PROPERTIES
VERSION ${gRPC_CORE_VERSION}
SOVERSION ${gRPC_CORE_SOVERSION}
-@@ -1829,6 +1833,12 @@ if(WIN32 AND MSVC)
+@@ -1871,6 +1875,12 @@ if(WIN32 AND MSVC)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_csharp_ext.pdb
DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL
)
-+
++
+ install(TARGETS grpc_csharp_ext
+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
|