diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2021-04-23 10:40:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-23 10:40:07 -0700 |
| commit | e4096d6c17799638de97ceca4583d9adfc54b87b (patch) | |
| tree | 9b9994234552e28c96934dd7ab489554b34109e2 /ports/upb/add-cmake-install.patch | |
| parent | 46de713371cc0161276a2668547901f684aef014 (diff) | |
| download | vcpkg-e4096d6c17799638de97ceca4583d9adfc54b87b.tar.gz vcpkg-e4096d6c17799638de97ceca4583d9adfc54b87b.zip | |
[grpc][upb] Update to newer versions (#17422)
* [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>
Diffstat (limited to 'ports/upb/add-cmake-install.patch')
| -rw-r--r-- | ports/upb/add-cmake-install.patch | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/ports/upb/add-cmake-install.patch b/ports/upb/add-cmake-install.patch index cdda03407..0cc9aba3e 100644 --- a/ports/upb/add-cmake-install.patch +++ b/ports/upb/add-cmake-install.patch @@ -1,7 +1,7 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4dd6454..eda6a72 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
+diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
+index d4cbcc9..a6b432f 100644
+--- a/cmake/CMakeLists.txt
++++ b/cmake/CMakeLists.txt
@@ -8,7 +8,7 @@ else()
cmake_policy(VERSION 3.12)
endif()
@@ -11,31 +11,20 @@ index 4dd6454..eda6a72 100644 cmake_policy(SET CMP0048 NEW)
project(upb)
-@@ -62,6 +62,7 @@ enable_testing()
+@@ -62,6 +62,7 @@ endif()
+ enable_testing()
- add_library(port
- upb/port.c)
+ add_library(port INTERFACE)
+add_library(descriptor_upbproto INTERFACE)
add_library(upb
- upb/decode.c
- upb/encode.c
-@@ -154,6 +155,7 @@ target_link_libraries(upb_cc_bindings INTERFACE
- handlers
- port
- upb)
-+if(ENABLE_TESTING)
- add_library(upb_test
- tests/testmain.cc
- tests/test_util.h
-@@ -162,5 +164,28 @@ target_link_libraries(upb_test
- handlers
- port
- upb)
-+endif()
+ ../upb/decode.c
+ ../upb/decode.int.h
+@@ -162,4 +163,27 @@ target_link_libraries(upb_json
+ upb_pb)
+ add_library(wyhash INTERFACE)
--
+install(
-+ DIRECTORY upb
++ DIRECTORY ../upb
+ DESTINATION include
+ FILES_MATCHING
+ PATTERN "*.h"
@@ -46,7 +35,7 @@ index 4dd6454..eda6a72 100644 +target_include_directories(upb PUBLIC $<INSTALL_INTERFACE:include>)
+install(TARGETS
+ upb
-+ upb_cc_bindings
++ fastdecode
+ upb_json
+ upb_pb
+ port
@@ -57,3 +46,4 @@ index 4dd6454..eda6a72 100644 + EXPORT upb-config
+)
+install(EXPORT upb-config NAMESPACE upb:: DESTINATION share/upb)
+
|