mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 13:49:00 +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
17 lines
551 B
Diff
17 lines
551 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 3839e22..91720a9 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -99,6 +99,11 @@ set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
|
|
|
|
add_definitions(-DPB_FIELD_32BIT)
|
|
|
|
+if (gRPC_STATIC_LINKING AND NOT _gRPC_PLATFORM_WINDOWS)
|
|
+ # Force to static link
|
|
+ set(CMAKE_EXE_LINKER_FLAGS "-Bstatic")
|
|
+endif()
|
|
+
|
|
if (MSVC)
|
|
include(cmake/msvc_static_runtime.cmake)
|
|
add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS)
|