mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 21:49:06 +08:00
e4096d6c17
* [gRPC] 1.36.4 * [upb] update to 2020-12-19 * update version * [upb] Fix config.cmake file * [grpc] Restore using system upb * [grpc][upb] Version db changes * [grpc][upb] Fix building upbdefs in grpc Co-authored-by: Jeong YunWon <jeong@youknowone.org> Co-authored-by: Jonliu1993 <13720414433@163.com>
141 lines
3.7 KiB
Diff
141 lines
3.7 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index c848b50605..7822c4f713 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -84,6 +84,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package")
|
|
set(gRPC_PROTOBUF_PROVIDER "module" CACHE STRING "Provider of protobuf library")
|
|
set_property(CACHE gRPC_PROTOBUF_PROVIDER PROPERTY STRINGS "module" "package")
|
|
|
|
+set(gRPC_UPB_PROVIDER "module" CACHE STRING "Provider of upb library")
|
|
+set_property(CACHE gRPC_UPB_PROVIDER PROPERTY STRINGS "module" "package")
|
|
+
|
|
set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package")
|
|
set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE")
|
|
|
|
@@ -2037,7 +2040,6 @@ target_link_libraries(grpc
|
|
${_gRPC_ALLTARGETS_LIBRARIES}
|
|
gpr
|
|
address_sorting
|
|
- upb
|
|
absl::optional
|
|
absl::strings
|
|
absl::statusor
|
|
@@ -2122,7 +2124,6 @@ target_link_libraries(grpc_csharp_ext
|
|
grpc
|
|
gpr
|
|
address_sorting
|
|
- upb
|
|
)
|
|
|
|
|
|
@@ -2590,7 +2591,6 @@ target_link_libraries(grpc_unsecure
|
|
${_gRPC_ALLTARGETS_LIBRARIES}
|
|
gpr
|
|
address_sorting
|
|
- upb
|
|
absl::optional
|
|
absl::strings
|
|
absl::statusor
|
|
@@ -2792,7 +2792,6 @@ target_link_libraries(grpc++
|
|
grpc
|
|
gpr
|
|
address_sorting
|
|
- upb
|
|
)
|
|
|
|
foreach(_hdr
|
|
@@ -3040,7 +3039,6 @@ target_link_libraries(grpc++_alts
|
|
grpc
|
|
gpr
|
|
address_sorting
|
|
- upb
|
|
)
|
|
|
|
foreach(_hdr
|
|
@@ -3104,7 +3102,6 @@ target_link_libraries(grpc++_error_details
|
|
grpc
|
|
gpr
|
|
address_sorting
|
|
- upb
|
|
)
|
|
|
|
foreach(_hdr
|
|
@@ -3174,7 +3171,6 @@ target_link_libraries(grpc++_reflection
|
|
grpc
|
|
gpr
|
|
address_sorting
|
|
- upb
|
|
)
|
|
|
|
foreach(_hdr
|
|
@@ -3454,7 +3450,6 @@ target_link_libraries(grpc++_unsecure
|
|
grpc_unsecure
|
|
gpr
|
|
address_sorting
|
|
- upb
|
|
)
|
|
|
|
foreach(_hdr
|
|
@@ -3773,7 +3768,6 @@ target_link_libraries(grpcpp_channelz
|
|
grpc
|
|
gpr
|
|
address_sorting
|
|
- upb
|
|
)
|
|
|
|
foreach(_hdr
|
|
@@ -3799,6 +3793,7 @@ endif()
|
|
|
|
endif()
|
|
|
|
+if (gRPC_UPB_PROVIDER STREQUAL "module")
|
|
add_library(upb
|
|
third_party/upb/upb/decode_fast.c
|
|
third_party/upb/upb/decode.c
|
|
@@ -3857,7 +3852,7 @@ if(gRPC_INSTALL)
|
|
)
|
|
endif()
|
|
|
|
-
|
|
+endif()
|
|
|
|
add_executable(check_epollexclusive
|
|
test/build/check_epollexclusive.c
|
|
diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in
|
|
index 3623f4aa5e..df6ced560e 100644
|
|
--- a/cmake/gRPCConfig.cmake.in
|
|
+++ b/cmake/gRPCConfig.cmake.in
|
|
@@ -8,6 +8,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules)
|
|
@_gRPC_FIND_CARES@
|
|
@_gRPC_FIND_ABSL@
|
|
@_gRPC_FIND_RE2@
|
|
+@_gRPC_FIND_UPB@
|
|
|
|
# Targets
|
|
include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake)
|
|
diff --git a/cmake/upb.cmake b/cmake/upb.cmake
|
|
index f2a0e508c3..ecce7ba300 100644
|
|
--- a/cmake/upb.cmake
|
|
+++ b/cmake/upb.cmake
|
|
@@ -12,9 +12,20 @@
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
+set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated")
|
|
+if (gRPC_UPB_PROVIDER STREQUAL "module")
|
|
+
|
|
set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb)
|
|
|
|
set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}")
|
|
set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated")
|
|
|
|
set(_gRPC_UPB_LIBRARIES upb)
|
|
+
|
|
+elseif(gRPC_UPB_PROVIDER STREQUAL "package")
|
|
+ find_package(upb CONFIG REQUIRED)
|
|
+ set(_gRPC_UPB_LIBRARIES upb::upb)
|
|
+ set(_gRPC_UPB_INCLUDE_DIR)
|
|
+ set(upb ${_gRPC_UPB_LIBRARIES})
|
|
+ set(_gRPC_FIND_UPB "if(NOT upb_FOUND)\n find_package(upb CONFIG REQUIRED)\nendif()")
|
|
+endif()
|