74 lines
2.4 KiB
Diff
74 lines
2.4 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 7a97604..4967c4f 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -215,6 +215,9 @@ if(UNIX)
|
||
|
|
endif()
|
||
|
|
if(WIN32)
|
||
|
|
set(_gRPC_PLATFORM_WINDOWS ON)
|
||
|
|
+ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
|
||
|
|
+ set(_gRPC_PLATFORM_UWP ON)
|
||
|
|
+ endif()
|
||
|
|
endif()
|
||
|
|
|
||
|
|
# Use C99 standard
|
||
|
|
@@ -259,6 +262,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")
|
||
|
|
endif()
|
||
|
|
@@ -336,6 +342,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()
|
||
|
|
@@ -408,6 +418,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}
|
||
|
|
)
|
||
|
|
@@ -424,6 +435,7 @@ add_custom_target(tools_cxx
|
||
|
|
|
||
|
|
add_custom_target(tools
|
||
|
|
DEPENDS tools_c tools_cxx)
|
||
|
|
+endif()
|
||
|
|
|
||
|
|
protobuf_generate_grpc_cpp(
|
||
|
|
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 5d2bdc1..e9870c2 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
|
||
|
|
@@ -39,6 +39,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";
|
||
|
|
|
||
|
|
@@ -71,6 +72,9 @@ bool check_windows_registry_product_name(HKEY root_key,
|
||
|
|
}
|
||
|
|
|
||
|
|
return strstr(buffer, expected_substr) != nullptr;
|
||
|
|
+#else
|
||
|
|
+ return false;
|
||
|
|
+#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
} // namespace internal
|