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 | 166 |
1 files changed, 166 insertions, 0 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 new file mode 100644 index 000000000..f8d965294 --- /dev/null +++ b/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch | |||
@@ -0,0 +1,166 @@ | |||
1 | From 8e9bf962a45a82f1c2eb5858e29fa89a3a60b564 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 1/4] 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 | %% original patch: 0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch | ||
11 | --- | ||
12 | CMakeLists.txt | 55 +++++++++++++++++++++++++++++++++++ | ||
13 | CMakeLists.txt => CMakeLists.txt.orig | 0 | ||
14 | 2 files changed, 55 insertions(+) | ||
15 | copy CMakeLists.txt => CMakeLists.txt.orig (100%) | ||
16 | |||
17 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
18 | index b1a49df..13e64ac 100644 | ||
19 | --- a/CMakeLists.txt | ||
20 | +++ b/CMakeLists.txt | ||
21 | @@ -30,6 +30,15 @@ set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") | ||
22 | set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/") | ||
23 | project(${PACKAGE_NAME} C CXX) | ||
24 | |||
25 | +set (CORE_VERSION_MAJOR "4") | ||
26 | +set (CORE_VERSION "4.0.0") | ||
27 | + | ||
28 | +set (CPP_VERSION_MAJOR "1") | ||
29 | +set (CPP_VERSION "${PACKAGE_VERSION}") | ||
30 | + | ||
31 | +set (CSHARP_VERSION_MAJOR "1") | ||
32 | +set (CSHARP_VERSION "${PACKAGE_VERSION}") | ||
33 | + | ||
34 | set(gRPC_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables") | ||
35 | set(gRPC_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") | ||
36 | set(gRPC_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers") | ||
37 | @@ -841,6 +850,10 @@ if(WIN32 AND MSVC) | ||
38 | endif() | ||
39 | endif() | ||
40 | |||
41 | +if(_gRPC_PLATFORM_LINUX) | ||
42 | + set_property(TARGET gpr PROPERTY VERSION ${CORE_VERSION}) | ||
43 | + set_property(TARGET gpr PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) | ||
44 | +endif() | ||
45 | |||
46 | target_include_directories(gpr | ||
47 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
48 | @@ -1221,6 +1234,10 @@ if(WIN32 AND MSVC) | ||
49 | endif() | ||
50 | endif() | ||
51 | |||
52 | +if(_gRPC_PLATFORM_LINUX) | ||
53 | + set_property(TARGET grpc PROPERTY VERSION ${CORE_VERSION}) | ||
54 | + set_property(TARGET grpc PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) | ||
55 | +endif() | ||
56 | |||
57 | target_include_directories(grpc | ||
58 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
59 | @@ -1535,6 +1552,10 @@ if(WIN32 AND MSVC) | ||
60 | endif() | ||
61 | endif() | ||
62 | |||
63 | +if(_gRPC_PLATFORM_LINUX) | ||
64 | + set_property(TARGET grpc_cronet PROPERTY VERSION ${CORE_VERSION}) | ||
65 | + set_property(TARGET grpc_cronet PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) | ||
66 | +endif() | ||
67 | |||
68 | target_include_directories(grpc_cronet | ||
69 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
70 | @@ -2377,6 +2398,10 @@ if(WIN32 AND MSVC) | ||
71 | endif() | ||
72 | endif() | ||
73 | |||
74 | +if(_gRPC_PLATFORM_LINUX) | ||
75 | + set_property(TARGET grpc_unsecure PROPERTY VERSION ${CORE_VERSION}) | ||
76 | + set_property(TARGET grpc_unsecure PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) | ||
77 | +endif() | ||
78 | |||
79 | target_include_directories(grpc_unsecure | ||
80 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
81 | @@ -2592,6 +2617,10 @@ if(WIN32 AND MSVC) | ||
82 | endif() | ||
83 | endif() | ||
84 | |||
85 | +if(_gRPC_PLATFORM_LINUX) | ||
86 | + set_property(TARGET grpc++ PROPERTY VERSION ${CPP_VERSION}) | ||
87 | + set_property(TARGET grpc++ PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) | ||
88 | +endif() | ||
89 | |||
90 | target_include_directories(grpc++ | ||
91 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
92 | @@ -3078,6 +3107,10 @@ if(WIN32 AND MSVC) | ||
93 | endif() | ||
94 | endif() | ||
95 | |||
96 | +if(_gRPC_PLATFORM_LINUX) | ||
97 | + set_property(TARGET grpc++_cronet PROPERTY VERSION ${CPP_VERSION}) | ||
98 | + set_property(TARGET grpc++_cronet PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) | ||
99 | +endif() | ||
100 | |||
101 | target_include_directories(grpc++_cronet | ||
102 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
103 | @@ -3282,6 +3315,11 @@ protobuf_generate_grpc_cpp( | ||
104 | src/proto/grpc/status/status.proto | ||
105 | ) | ||
106 | |||
107 | +if(_gRPC_PLATFORM_LINUX) | ||
108 | + set_property(TARGET grpc++_error_details PROPERTY VERSION ${CPP_VERSION}) | ||
109 | + set_property(TARGET grpc++_error_details PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) | ||
110 | +endif() | ||
111 | + | ||
112 | target_include_directories(grpc++_error_details | ||
113 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
114 | PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} | ||
115 | @@ -3408,6 +3446,11 @@ protobuf_generate_grpc_cpp( | ||
116 | src/proto/grpc/reflection/v1alpha/reflection.proto | ||
117 | ) | ||
118 | |||
119 | +if(_gRPC_PLATFORM_LINUX) | ||
120 | + set_property(TARGET grpc++_reflection PROPERTY VERSION ${CPP_VERSION}) | ||
121 | + set_property(TARGET grpc++_reflection PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) | ||
122 | +endif() | ||
123 | + | ||
124 | target_include_directories(grpc++_reflection | ||
125 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
126 | PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} | ||
127 | @@ -3827,6 +3870,10 @@ if(WIN32 AND MSVC) | ||
128 | endif() | ||
129 | endif() | ||
130 | |||
131 | +if(_gRPC_PLATFORM_LINUX) | ||
132 | + set_property(TARGET grpc++_unsecure PROPERTY VERSION ${CPP_VERSION}) | ||
133 | + set_property(TARGET grpc++_unsecure PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) | ||
134 | +endif() | ||
135 | |||
136 | target_include_directories(grpc++_unsecure | ||
137 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
138 | @@ -4140,6 +4187,10 @@ if(WIN32 AND MSVC) | ||
139 | endif() | ||
140 | endif() | ||
141 | |||
142 | +if(_gRPC_PLATFORM_LINUX) | ||
143 | + set_property(TARGET grpc_plugin_support PROPERTY VERSION ${CORE_VERSION}) | ||
144 | + set_property(TARGET grpc_plugin_support PROPERTY SOVERSION ${CORE_VERSION_MAJOR}) | ||
145 | +endif() | ||
146 | |||
147 | target_include_directories(grpc_plugin_support | ||
148 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
149 | @@ -4649,6 +4700,10 @@ if(WIN32 AND MSVC) | ||
150 | endif() | ||
151 | endif() | ||
152 | |||
153 | +if(_gRPC_PLATFORM_LINUX) | ||
154 | + set_property(TARGET grpc_csharp_ext PROPERTY VERSION ${CSHARP_VERSION}) | ||
155 | + set_property(TARGET grpc_csharp_ext PROPERTY SOVERSION ${CSHARP_VERSION_MAJOR}) | ||
156 | +endif() | ||
157 | |||
158 | target_include_directories(grpc_csharp_ext | ||
159 | PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | ||
160 | diff --git a/CMakeLists.txt b/CMakeLists.txt.orig | ||
161 | similarity index 100% | ||
162 | copy from CMakeLists.txt | ||
163 | copy to CMakeLists.txt.orig | ||
164 | -- | ||
165 | 2.16.1 | ||
166 | |||