mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-30 20:59:12 +08:00
2fda34be1f
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
14 lines
345 B
Diff
14 lines
345 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index e820737201..3eb4795660 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -158,7 +158,7 @@ elseif(UNIX)
|
|
endif()
|
|
|
|
if(WIN32 AND MSVC)
|
|
- set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32)
|
|
+ set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 gdi32)
|
|
endif()
|
|
|
|
# Create directory for generated .proto files
|