mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-12 19:32:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5c30e5b6bc
vcpkg/ports/grpc/00004-link-gdi32-on-windows.patch

14 lines
355 B
Diff
Raw Normal View History

[grpc] #6485 - Fix ARM/ARM64 on Windows Build (#6487) This PR includes the following changes that are required to get gRPC to build for ARM/ARM64 on Windows 1) Updated to v1.20.1 2) Disables Codegen Build for ARM/ARM64 builds 3) Rebased the "Fix UWP" patch so that it will apply properly 4) Fixed the "Static Linking in Linux" patch because it specified an invalid option on Windows builds 5) Added patch to "#undef" a macro name collision 6) Added GDI32.lib to the list of standard libraries linked to Windows
2019-05-18 02:18:26 +08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
[gRPC] Update to 1.27.1 (#9963) * gRPC 1.27.0 * trigger build * update to v1.27.1 * update control file
2020-02-12 08:33:48 +08:00
index c4057b3..a6a0f23 100644
[grpc] #6485 - Fix ARM/ARM64 on Windows Build (#6487) This PR includes the following changes that are required to get gRPC to build for ARM/ARM64 on Windows 1) Updated to v1.20.1 2) Disables Codegen Build for ARM/ARM64 builds 3) Rebased the "Fix UWP" patch so that it will apply properly 4) Fixed the "Static Linking in Linux" patch because it specified an invalid option on Windows builds 5) Added patch to "#undef" a macro name collision 6) Added GDI32.lib to the list of standard libraries linked to Windows
2019-05-18 02:18:26 +08:00
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
[gRPC] Update to 1.27.1 (#9963) * gRPC 1.27.0 * trigger build * update to v1.27.1 * update control file
2020-02-12 08:33:48 +08:00
@@ -220,7 +220,7 @@ elseif(UNIX)
[grpc] #6485 - Fix ARM/ARM64 on Windows Build (#6487) This PR includes the following changes that are required to get gRPC to build for ARM/ARM64 on Windows 1) Updated to v1.20.1 2) Disables Codegen Build for ARM/ARM64 builds 3) Rebased the "Fix UWP" patch so that it will apply properly 4) Fixed the "Static Linking in Linux" patch because it specified an invalid option on Windows builds 5) Added patch to "#undef" a macro name collision 6) Added GDI32.lib to the list of standard libraries linked to Windows
2019-05-18 02:18:26 +08:00
endif()
if(WIN32 AND MSVC)
[gRPC] Update to 1.27.1 (#9963) * gRPC 1.27.0 * trigger build * update to v1.27.1 * update control file
2020-02-12 08:33:48 +08:00
- set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32)
+ set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32)
[grpc] #6485 - Fix ARM/ARM64 on Windows Build (#6487) This PR includes the following changes that are required to get gRPC to build for ARM/ARM64 on Windows 1) Updated to v1.20.1 2) Disables Codegen Build for ARM/ARM64 builds 3) Rebased the "Fix UWP" patch so that it will apply properly 4) Fixed the "Static Linking in Linux" patch because it specified an invalid option on Windows builds 5) Added patch to "#undef" a macro name collision 6) Added GDI32.lib to the list of standard libraries linked to Windows
2019-05-18 02:18:26 +08:00
endif()
# Create directory for generated .proto files
Reference in New Issue Copy Permalink