diff options
Diffstat (limited to 'meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch')
-rw-r--r-- | meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch b/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch index 3282b5413..e517355d3 100644 --- a/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch +++ b/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch | |||
@@ -29,7 +29,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
29 | set(gRPC_INSTALL_BINDIR "bin" CACHE STRING "Installation directory for executables") | 29 | set(gRPC_INSTALL_BINDIR "bin" CACHE STRING "Installation directory for executables") |
30 | set(gRPC_INSTALL_LIBDIR "lib" CACHE STRING "Installation directory for libraries") | 30 | set(gRPC_INSTALL_LIBDIR "lib" CACHE STRING "Installation directory for libraries") |
31 | set(gRPC_INSTALL_INCLUDEDIR "include" CACHE STRING "Installation directory for headers") | 31 | set(gRPC_INSTALL_INCLUDEDIR "include" CACHE STRING "Installation directory for headers") |
32 | @@ -769,6 +778,10 @@ if(WIN32 AND MSVC) | 32 | @@ -777,6 +786,10 @@ if(WIN32 AND MSVC) |
33 | endif() | 33 | endif() |
34 | endif() | 34 | endif() |
35 | 35 | ||
@@ -51,7 +51,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
51 | 51 | ||
52 | target_include_directories(gpr | 52 | target_include_directories(gpr |
53 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 53 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
54 | @@ -1333,6 +1350,10 @@ if(WIN32 AND MSVC) | 54 | @@ -1367,6 +1384,10 @@ if(WIN32 AND MSVC) |
55 | endif() | 55 | endif() |
56 | endif() | 56 | endif() |
57 | 57 | ||
@@ -62,7 +62,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
62 | 62 | ||
63 | target_include_directories(grpc | 63 | target_include_directories(grpc |
64 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 64 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
65 | @@ -1731,6 +1752,10 @@ if(WIN32 AND MSVC) | 65 | @@ -1782,6 +1803,10 @@ if(WIN32 AND MSVC) |
66 | endif() | 66 | endif() |
67 | endif() | 67 | endif() |
68 | 68 | ||
@@ -73,7 +73,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
73 | 73 | ||
74 | target_include_directories(grpc_cronet | 74 | target_include_directories(grpc_cronet |
75 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 75 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
76 | @@ -2744,6 +2769,10 @@ if(WIN32 AND MSVC) | 76 | @@ -2869,6 +2894,10 @@ if(WIN32 AND MSVC) |
77 | endif() | 77 | endif() |
78 | endif() | 78 | endif() |
79 | 79 | ||
@@ -84,7 +84,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
84 | 84 | ||
85 | target_include_directories(grpc_unsecure | 85 | target_include_directories(grpc_unsecure |
86 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 86 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
87 | @@ -3083,6 +3112,10 @@ if(WIN32 AND MSVC) | 87 | @@ -3206,6 +3235,10 @@ if(WIN32 AND MSVC) |
88 | endif() | 88 | endif() |
89 | endif() | 89 | endif() |
90 | 90 | ||
@@ -95,18 +95,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
95 | 95 | ||
96 | target_include_directories(grpc++ | 96 | target_include_directories(grpc++ |
97 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 97 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
98 | @@ -3703,6 +3736,10 @@ if(WIN32 AND MSVC) | 98 | @@ -3589,6 +3622,11 @@ protobuf_generate_grpc_cpp( |
99 | endif() | ||
100 | endif() | ||
101 | |||
102 | +if(_gRPC_PLATFORM_LINUX) | ||
103 | + set_property(TARGET grpc++_cronet PROPERTY VERSION ${CPP_VERSION}) | ||
104 | + set_property(TARGET grpc++_cronet PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) | ||
105 | +endif() | ||
106 | |||
107 | target_include_directories(grpc++_cronet | ||
108 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
109 | @@ -4013,6 +4050,11 @@ protobuf_generate_grpc_cpp( | ||
110 | src/proto/grpc/status/status.proto | 99 | src/proto/grpc/status/status.proto |
111 | ) | 100 | ) |
112 | 101 | ||
@@ -118,7 +107,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
118 | target_include_directories(grpc++_error_details | 107 | target_include_directories(grpc++_error_details |
119 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 108 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
120 | PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} | 109 | PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} |
121 | @@ -4147,6 +4189,11 @@ protobuf_generate_grpc_cpp( | 110 | @@ -3727,6 +3765,11 @@ protobuf_generate_grpc_cpp( |
122 | src/proto/grpc/reflection/v1alpha/reflection.proto | 111 | src/proto/grpc/reflection/v1alpha/reflection.proto |
123 | ) | 112 | ) |
124 | 113 | ||
@@ -130,7 +119,18 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
130 | target_include_directories(grpc++_reflection | 119 | target_include_directories(grpc++_reflection |
131 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 120 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
132 | PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} | 121 | PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} |
133 | @@ -4704,6 +4751,10 @@ if(WIN32 AND MSVC) | 122 | @@ -3816,6 +3859,10 @@ target_link_libraries(grpc++_test_config |
123 | ${_gRPC_GFLAGS_LIBRARIES} | ||
124 | ) | ||
125 | |||
126 | +if(_gRPC_PLATFORM_LINUX) | ||
127 | + set_property(TARGET grpc++_cronet PROPERTY VERSION ${CPP_VERSION}) | ||
128 | + set_property(TARGET grpc++_cronet PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) | ||
129 | +endif() | ||
130 | |||
131 | endif (gRPC_BUILD_TESTS) | ||
132 | if (gRPC_BUILD_TESTS) | ||
133 | @@ -4307,6 +4354,10 @@ if(WIN32 AND MSVC) | ||
134 | endif() | 134 | endif() |
135 | endif() | 135 | endif() |
136 | 136 | ||
@@ -141,7 +141,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
141 | 141 | ||
142 | target_include_directories(grpc++_unsecure | 142 | target_include_directories(grpc++_unsecure |
143 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 143 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
144 | @@ -5124,6 +5175,10 @@ if(WIN32 AND MSVC) | 144 | @@ -4745,6 +4796,10 @@ if(WIN32 AND MSVC) |
145 | endif() | 145 | endif() |
146 | endif() | 146 | endif() |
147 | 147 | ||
@@ -152,7 +152,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
152 | 152 | ||
153 | target_include_directories(grpc_plugin_support | 153 | target_include_directories(grpc_plugin_support |
154 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 154 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
155 | @@ -5190,6 +5245,11 @@ protobuf_generate_grpc_cpp( | 155 | @@ -4813,6 +4868,11 @@ protobuf_generate_grpc_cpp( |
156 | src/proto/grpc/channelz/channelz.proto | 156 | src/proto/grpc/channelz/channelz.proto |
157 | ) | 157 | ) |
158 | 158 | ||
@@ -164,7 +164,7 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | |||
164 | target_include_directories(grpcpp_channelz | 164 | target_include_directories(grpcpp_channelz |
165 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | 165 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> |
166 | PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} | 166 | PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} |
167 | @@ -5728,6 +5788,10 @@ if(WIN32 AND MSVC) | 167 | @@ -5367,6 +5427,10 @@ if(WIN32 AND MSVC) |
168 | endif() | 168 | endif() |
169 | endif() | 169 | endif() |
170 | 170 | ||