diff options
Diffstat (limited to 'meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch')
-rw-r--r-- | meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch | 177 |
1 files changed, 0 insertions, 177 deletions
diff --git a/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch b/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch deleted file mode 100644 index e517355d3..000000000 --- a/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch +++ /dev/null | |||
@@ -1,177 +0,0 @@ | |||
1 | From 2279e30be5796e9b185545543ea54fe68633cbdd Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexey Firago <alexey_firago@mentor.com> | ||
3 | Date: Mon, 30 Oct 2017 23:24:49 +0300 | ||
4 | Subject: [PATCH] CMakeLists.txt: Fix libraries installation for Linux | ||
5 | |||
6 | * Set libs versions as in Makefile | ||
7 | |||
8 | Signed-off-by: Alexey Firago <alexey_firago@mentor.com> | ||
9 | |||
10 | --- | ||
11 | CMakeLists.txt | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ | ||
12 | 1 file changed, 59 insertions(+) | ||
13 | |||
14 | --- a/CMakeLists.txt | ||
15 | +++ b/CMakeLists.txt | ||
16 | @@ -30,6 +30,15 @@ set(PACKAGE_TARNAME "${PACKAGE_NAME}-$ | ||
17 | set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/") | ||
18 | project(${PACKAGE_NAME} C CXX) | ||
19 | |||
20 | +set (CORE_VERSION_MAJOR "6") | ||
21 | +set (CORE_VERSION "6.0.0") | ||
22 | + | ||
23 | +set (CPP_VERSION_MAJOR "1") | ||
24 | +set (CPP_VERSION "${PACKAGE_VERSION}") | ||
25 | + | ||
26 | +set (CSHARP_VERSION_MAJOR "1") | ||
27 | +set (CSHARP_VERSION "${PACKAGE_VERSION}") | ||
28 | + | ||
29 | set(gRPC_INSTALL_BINDIR "bin" CACHE STRING "Installation directory for executables") | ||
30 | set(gRPC_INSTALL_LIBDIR "lib" CACHE STRING "Installation directory for libraries") | ||
31 | set(gRPC_INSTALL_INCLUDEDIR "include" CACHE STRING "Installation directory for headers") | ||
32 | @@ -777,6 +786,10 @@ if(WIN32 AND MSVC) | ||
33 | endif() | ||
34 | endif() | ||
35 | |||
36 | +if(_gRPC_PLATFORM_LINUX) | ||
37 | + set_property(TARGET address_sorting PROPERTY VERSION ${CORE_VERSION}) | ||
38 | + set_property(TARGET address_sorting PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) | ||
39 | +endif() | ||
40 | |||
41 | target_include_directories(address_sorting | ||
42 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
43 | @@ -903,6 +916,10 @@ if(WIN32 AND MSVC) | ||
44 | endif() | ||
45 | endif() | ||
46 | |||
47 | +if(_gRPC_PLATFORM_LINUX) | ||
48 | + set_property(TARGET gpr PROPERTY VERSION ${CORE_VERSION}) | ||
49 | + set_property(TARGET gpr PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) | ||
50 | +endif() | ||
51 | |||
52 | target_include_directories(gpr | ||
53 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
54 | @@ -1367,6 +1384,10 @@ if(WIN32 AND MSVC) | ||
55 | endif() | ||
56 | endif() | ||
57 | |||
58 | +if(_gRPC_PLATFORM_LINUX) | ||
59 | + set_property(TARGET grpc PROPERTY VERSION ${CORE_VERSION}) | ||
60 | + set_property(TARGET grpc PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) | ||
61 | +endif() | ||
62 | |||
63 | target_include_directories(grpc | ||
64 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
65 | @@ -1782,6 +1803,10 @@ if(WIN32 AND MSVC) | ||
66 | endif() | ||
67 | endif() | ||
68 | |||
69 | +if(_gRPC_PLATFORM_LINUX) | ||
70 | + set_property(TARGET grpc_cronet PROPERTY VERSION ${CORE_VERSION}) | ||
71 | + set_property(TARGET grpc_cronet PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) | ||
72 | +endif() | ||
73 | |||
74 | target_include_directories(grpc_cronet | ||
75 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
76 | @@ -2869,6 +2894,10 @@ if(WIN32 AND MSVC) | ||
77 | endif() | ||
78 | endif() | ||
79 | |||
80 | +if(_gRPC_PLATFORM_LINUX) | ||
81 | + set_property(TARGET grpc_unsecure PROPERTY VERSION ${CORE_VERSION}) | ||
82 | + set_property(TARGET grpc_unsecure PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) | ||
83 | +endif() | ||
84 | |||
85 | target_include_directories(grpc_unsecure | ||
86 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
87 | @@ -3206,6 +3235,10 @@ if(WIN32 AND MSVC) | ||
88 | endif() | ||
89 | endif() | ||
90 | |||
91 | +if(_gRPC_PLATFORM_LINUX) | ||
92 | + set_property(TARGET grpc++ PROPERTY VERSION ${CPP_VERSION}) | ||
93 | + set_property(TARGET grpc++ PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) | ||
94 | +endif() | ||
95 | |||
96 | target_include_directories(grpc++ | ||
97 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
98 | @@ -3589,6 +3622,11 @@ protobuf_generate_grpc_cpp( | ||
99 | src/proto/grpc/status/status.proto | ||
100 | ) | ||
101 | |||
102 | +if(_gRPC_PLATFORM_LINUX) | ||
103 | + set_property(TARGET grpc++_error_details PROPERTY VERSION ${CPP_VERSION}) | ||
104 | + set_property(TARGET grpc++_error_details PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) | ||
105 | +endif() | ||
106 | + | ||
107 | target_include_directories(grpc++_error_details | ||
108 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
109 | PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} | ||
110 | @@ -3727,6 +3765,11 @@ protobuf_generate_grpc_cpp( | ||
111 | src/proto/grpc/reflection/v1alpha/reflection.proto | ||
112 | ) | ||
113 | |||
114 | +if(_gRPC_PLATFORM_LINUX) | ||
115 | + set_property(TARGET grpc++_reflection PROPERTY VERSION ${CPP_VERSION}) | ||
116 | + set_property(TARGET grpc++_reflection PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) | ||
117 | +endif() | ||
118 | + | ||
119 | target_include_directories(grpc++_reflection | ||
120 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
121 | PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} | ||
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() | ||
135 | endif() | ||
136 | |||
137 | +if(_gRPC_PLATFORM_LINUX) | ||
138 | + set_property(TARGET grpc++_unsecure PROPERTY VERSION ${CPP_VERSION}) | ||
139 | + set_property(TARGET grpc++_unsecure PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) | ||
140 | +endif() | ||
141 | |||
142 | target_include_directories(grpc++_unsecure | ||
143 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
144 | @@ -4745,6 +4796,10 @@ if(WIN32 AND MSVC) | ||
145 | endif() | ||
146 | endif() | ||
147 | |||
148 | +if(_gRPC_PLATFORM_LINUX) | ||
149 | + set_property(TARGET grpc_plugin_support PROPERTY VERSION ${CORE_VERSION}) | ||
150 | + set_property(TARGET grpc_plugin_support PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) | ||
151 | +endif() | ||
152 | |||
153 | target_include_directories(grpc_plugin_support | ||
154 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
155 | @@ -4813,6 +4868,11 @@ protobuf_generate_grpc_cpp( | ||
156 | src/proto/grpc/channelz/channelz.proto | ||
157 | ) | ||
158 | |||
159 | +if(_gRPC_PLATFORM_LINUX) | ||
160 | + set_property(TARGET grpcpp_channelz PROPERTY VERSION ${CPP_VERSION}) | ||
161 | + set_property(TARGET grpcpp_channelz PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) | ||
162 | +endif() | ||
163 | + | ||
164 | target_include_directories(grpcpp_channelz | ||
165 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
166 | PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} | ||
167 | @@ -5367,6 +5427,10 @@ if(WIN32 AND MSVC) | ||
168 | endif() | ||
169 | endif() | ||
170 | |||
171 | +if(_gRPC_PLATFORM_LINUX) | ||
172 | + set_property(TARGET grpc_csharp_ext PROPERTY VERSION ${CSHARP_VERSION}) | ||
173 | + set_property(TARGET grpc_csharp_ext PROPERTY SOVERSION ${CSHARP_VERSION_MAJOR}) | ||
174 | +endif() | ||
175 | |||
176 | target_include_directories(grpc_csharp_ext | ||
177 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||