mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-22 10:37:55 +08:00
110 lines
2.8 KiB
Diff
110 lines
2.8 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index a59fd818e3..774ee2f725 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -89,6 +89,9 @@ if(UNIX)
|
|
endif()
|
|
if(WIN32)
|
|
set(_gRPC_PLATFORM_WINDOWS ON)
|
|
+ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
|
|
+ set(_gRPC_PLATFORM_UWP ON)
|
|
+ endif()
|
|
endif()
|
|
|
|
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
|
|
@@ -155,6 +158,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()
|
|
@@ -189,6 +196,7 @@ function(protobuf_generate_grpc_cpp)
|
|
endforeach()
|
|
endfunction()
|
|
|
|
+if(NOT _gRPC_PLATFORM_UWP)
|
|
add_custom_target(plugins
|
|
DEPENDS
|
|
grpc_cpp_plugin
|
|
@@ -218,6 +226,8 @@ add_custom_target(tools_cxx
|
|
add_custom_target(tools
|
|
DEPENDS tools_c tools_cxx)
|
|
|
|
+endif()
|
|
+
|
|
if (gRPC_BUILD_TESTS)
|
|
add_custom_target(buildtests_c)
|
|
add_dependencies(buildtests_c algorithm_test)
|
|
@@ -3661,7 +3671,6 @@ foreach(_hdr
|
|
DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}"
|
|
)
|
|
endforeach()
|
|
-endif (gRPC_BUILD_CODEGEN)
|
|
|
|
|
|
if (gRPC_INSTALL)
|
|
@@ -3671,6 +3680,7 @@ if (gRPC_INSTALL)
|
|
ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
|
|
)
|
|
endif()
|
|
+endif (gRPC_BUILD_CODEGEN)
|
|
|
|
if (gRPC_BUILD_TESTS)
|
|
|
|
@@ -3793,7 +3803,7 @@ foreach(_hdr
|
|
DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}"
|
|
)
|
|
endforeach()
|
|
-endif (gRPC_BUILD_CODEGEN)
|
|
+
|
|
|
|
|
|
if (gRPC_INSTALL)
|
|
@@ -3803,6 +3813,7 @@ if (gRPC_INSTALL)
|
|
ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
|
|
)
|
|
endif()
|
|
+endif (gRPC_BUILD_CODEGEN)
|
|
|
|
if (gRPC_BUILD_TESTS)
|
|
|
|
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 55efe0e9dd..f538f26edf 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
|
|
@@ -60,6 +60,8 @@ bool check_bios_data(const char* bios_data_file) {
|
|
|
|
static void init_mu(void) { gpr_mu_init(&g_mu); }
|
|
|
|
+#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP
|
|
+
|
|
static bool run_powershell() {
|
|
SECURITY_ATTRIBUTES sa;
|
|
sa.nLength = sizeof(sa);
|
|
@@ -97,8 +99,12 @@ static bool run_powershell() {
|
|
CloseHandle(h);
|
|
return true;
|
|
}
|
|
+#endif
|
|
|
|
bool grpc_alts_is_running_on_gcp() {
|
|
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
|
|
+ g_is_on_compute_engine = false;
|
|
+#else
|
|
gpr_once_init(&g_once, init_mu);
|
|
gpr_mu_lock(&g_mu);
|
|
if (!g_compute_engine_detection_done) {
|
|
@@ -108,6 +114,7 @@ bool grpc_alts_is_running_on_gcp() {
|
|
g_compute_engine_detection_done = true;
|
|
}
|
|
gpr_mu_unlock(&g_mu);
|
|
+#endif
|
|
return g_is_on_compute_engine;
|
|
}
|
|
|