-
Notifications
You must be signed in to change notification settings - Fork 654
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[3rd-party] added vcpkg and grpc update
- Loading branch information
1 parent
a458656
commit f7603a6
Showing
16 changed files
with
282 additions
and
1,557 deletions.
There are no files selected for viewing
Submodule vcpkg
updated
6434 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index ec370e9..4f7d770 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -237,6 +237,9 @@ if(UNIX) | ||
endif() | ||
if(WIN32) | ||
set(_gRPC_PLATFORM_WINDOWS ON) | ||
+ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") | ||
+ set(_gRPC_PLATFORM_UWP ON) | ||
+ endif() | ||
endif() | ||
|
||
if (APPLE AND NOT DEFINED CMAKE_CXX_STANDARD) | ||
@@ -267,6 +270,9 @@ if(MSVC) | ||
set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4267") | ||
# TODO(jtattermusch): needed to build boringssl with VS2017, revisit later | ||
set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4987 /wd4774 /wd4819 /wd4996 /wd4619") | ||
+ if(_gRPC_PLATFORM_UWP) | ||
+ add_definitions(-DGRPC_ARES=0) | ||
+ endif() | ||
# Silences thousands of trucation warnings | ||
set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4503") | ||
# Tell MSVC to build grpc using utf-8 | ||
@@ -439,6 +445,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) | ||
# ``.proto`` files | ||
# | ||
function(protobuf_generate_grpc_cpp) | ||
+ if(_gRPC_PLATFORM_UWP) | ||
+ return() | ||
+ endif() | ||
+ | ||
if(NOT ARGN) | ||
message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files") | ||
return() | ||
@@ -561,6 +571,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN) | ||
list(APPEND _gRPC_PLUGIN_LIST grpc_ruby_plugin) | ||
endif () | ||
|
||
+if(NOT _gRPC_PLATFORM_UWP) | ||
add_custom_target(plugins | ||
DEPENDS ${_gRPC_PLUGIN_LIST} | ||
) | ||
@@ -575,6 +586,7 @@ add_custom_target(tools_cxx | ||
|
||
add_custom_target(tools | ||
DEPENDS tools_c tools_cxx) | ||
+endif() | ||
|
||
protobuf_generate_grpc_cpp_with_import_path_correction( | ||
src/proto/grpc/channelz/channelz.proto src/proto/grpc/channelz/channelz.proto | ||
diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc | ||
index b034cca..5dbdfe3 100644 | ||
--- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc | ||
+++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc | ||
@@ -40,6 +40,7 @@ bool check_bios_data(const char*) { return false; } | ||
bool check_windows_registry_product_name(HKEY root_key, | ||
const char* reg_key_path, | ||
const char* reg_key_name) { | ||
+ #if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP | ||
const size_t kProductNameBufferSize = 256; | ||
char const expected_substr[] = "Google"; | ||
|
||
@@ -72,6 +73,9 @@ bool check_windows_registry_product_name(HKEY root_key, | ||
} | ||
|
||
return strstr(buffer, expected_substr) != nullptr; | ||
+#else | ||
+ return false; | ||
+#endif | ||
} | ||
|
||
} // namespace internal |
10 changes: 5 additions & 5 deletions
10
3rd-party/vcpkg-ports/grpc/00004-link-gdi32-on-windows.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 25990a5d8a..8a632d2289 100644 | ||
index fce68b9..220f251 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -404,7 +404,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/xds) | ||
@@ -432,7 +432,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/xds) | ||
endif() | ||
|
||
if(WIN32) | ||
- set(_gRPC_BASELIB_LIBRARIES ws2_32 crypt32) | ||
+ set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32) | ||
- set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} ws2_32 crypt32) | ||
+ set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} wsock32 ws2_32 crypt32 gdi32) | ||
set(_gRPC_STATIC_WIN32 STATIC) | ||
endif() | ||
|
||
# Create directory for proto source files |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.