mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 09:49:08 +08:00
137 lines
3.5 KiB
Diff
137 lines
3.5 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index a6a0f23..1c170da 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1281,7 +1281,7 @@ target_link_libraries(alts_test_util
|
|
${_gRPC_ALLTARGETS_LIBRARIES}
|
|
grpc
|
|
gpr
|
|
- upb
|
|
+ ${_gRPC_UPB_LIBRARIES}
|
|
)
|
|
|
|
foreach(_hdr
|
|
@@ -1917,7 +1917,7 @@ target_link_libraries(grpc
|
|
${_gRPC_UPB_LIBRARIES}
|
|
${_gRPC_ALLTARGETS_LIBRARIES}
|
|
gpr
|
|
- upb
|
|
+ ${_gRPC_UPB_LIBRARIES}
|
|
)
|
|
if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
|
|
target_link_libraries(grpc "-framework CoreFoundation")
|
|
@@ -2328,7 +2328,7 @@ target_link_libraries(grpc_cronet
|
|
${_gRPC_UPB_LIBRARIES}
|
|
${_gRPC_ALLTARGETS_LIBRARIES}
|
|
gpr
|
|
- upb
|
|
+ ${_gRPC_UPB_LIBRARIES}
|
|
)
|
|
if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
|
|
target_link_libraries(grpc_cronet "-framework CoreFoundation")
|
|
@@ -2670,7 +2670,7 @@ target_link_libraries(grpc_test_util
|
|
${_gRPC_ALLTARGETS_LIBRARIES}
|
|
gpr
|
|
grpc
|
|
- upb
|
|
+ ${_gRPC_UPB_LIBRARIES}
|
|
)
|
|
if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
|
|
target_link_libraries(grpc_test_util "-framework CoreFoundation")
|
|
@@ -3013,7 +3013,7 @@ target_link_libraries(grpc_test_util_unsecure
|
|
${_gRPC_ALLTARGETS_LIBRARIES}
|
|
gpr
|
|
grpc_unsecure
|
|
- upb
|
|
+ ${_gRPC_UPB_LIBRARIES}
|
|
)
|
|
if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
|
|
target_link_libraries(grpc_test_util_unsecure "-framework CoreFoundation")
|
|
@@ -3404,7 +3404,7 @@ target_link_libraries(grpc_unsecure
|
|
${_gRPC_UPB_LIBRARIES}
|
|
${_gRPC_ALLTARGETS_LIBRARIES}
|
|
gpr
|
|
- upb
|
|
+ ${_gRPC_UPB_LIBRARIES}
|
|
)
|
|
if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)
|
|
target_link_libraries(grpc_unsecure "-framework CoreFoundation")
|
|
@@ -3743,7 +3743,7 @@ target_link_libraries(grpc++
|
|
${_gRPC_ALLTARGETS_LIBRARIES}
|
|
grpc
|
|
gpr
|
|
- upb
|
|
+ ${_gRPC_UPB_LIBRARIES}
|
|
)
|
|
|
|
foreach(_hdr
|
|
@@ -4070,7 +4070,7 @@ target_link_libraries(grpc++_alts
|
|
${_gRPC_ALLTARGETS_LIBRARIES}
|
|
grpc++
|
|
gpr
|
|
- upb
|
|
+ ${_gRPC_UPB_LIBRARIES}
|
|
)
|
|
|
|
foreach(_hdr
|
|
@@ -4876,7 +4876,7 @@ target_link_libraries(grpc++_unsecure
|
|
${_gRPC_ALLTARGETS_LIBRARIES}
|
|
gpr
|
|
grpc_unsecure
|
|
- upb
|
|
+ ${_gRPC_UPB_LIBRARIES}
|
|
)
|
|
|
|
foreach(_hdr
|
|
@@ -5898,7 +5898,7 @@ target_link_libraries(grpc_csharp_ext
|
|
|
|
|
|
endif()
|
|
-
|
|
+if(0)
|
|
add_library(upb
|
|
third_party/upb/upb/decode.c
|
|
third_party/upb/upb/encode.c
|
|
@@ -5938,10 +5938,10 @@ target_include_directories(upb
|
|
target_link_libraries(upb
|
|
${_gRPC_ALLTARGETS_LIBRARIES}
|
|
)
|
|
+endif()
|
|
|
|
|
|
-
|
|
-if(gRPC_INSTALL)
|
|
+if(gRPC_INSTALL AND 0)
|
|
install(TARGETS upb EXPORT gRPCTargets
|
|
RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
|
|
LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
|
|
diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in
|
|
index 5bfa73c..8a867df 100644
|
|
--- a/cmake/gRPCConfig.cmake.in
|
|
+++ b/cmake/gRPCConfig.cmake.in
|
|
@@ -7,6 +7,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules)
|
|
@_gRPC_FIND_SSL@
|
|
@_gRPC_FIND_CARES@
|
|
@_gRPC_FIND_ABSL@
|
|
+find_package(upb CONFIG)
|
|
|
|
# Targets
|
|
include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake)
|
|
diff --git a/cmake/upb.cmake b/cmake/upb.cmake
|
|
index 2c0ab84..746e067 100644
|
|
--- a/cmake/upb.cmake
|
|
+++ b/cmake/upb.cmake
|
|
@@ -12,9 +12,9 @@
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
-set(UPB_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/upb)
|
|
+find_package(upb REQUIRED)
|
|
+set(_gRPC_UPB_INCLUDE_DIR)
|
|
|
|
-set(_gRPC_UPB_INCLUDE_DIR "${UPB_ROOT_DIR}")
|
|
set(_gRPC_UPB_GRPC_GENERATED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated")
|
|
|
|
-set(_gRPC_UPB_LIBRARIES upb)
|
|
+set(_gRPC_UPB_LIBRARIES upb::upb)
|