Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@×××××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql-extras:master commit in: /
Date: Mon, 31 Mar 2014 17:49:03
Message-Id: 1396288121.0e9135d87a5b68b668414b4ff2af4df479f62a17.grknight.pub@gentoo
1 commit: 0e9135d87a5b68b668414b4ff2af4df479f62a17
2 Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
3 AuthorDate: Mon Mar 31 17:48:41 2014 +0000
4 Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
5 CommitDate: Mon Mar 31 17:48:41 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=0e9135d8
7
8 Respin elib patches for new percona versions
9
10 ---
11 00000_index.txt | 16 ++-
12 20006_all_cmake_elib-percona-5.5.36.patch | 168 +++++++++++++++++++++++++++++
13 20006_all_cmake_elib-percona-5.6.16.patch | 173 ++++++++++++++++++++++++++++++
14 3 files changed, 355 insertions(+), 2 deletions(-)
15
16 diff --git a/00000_index.txt b/00000_index.txt
17 index e1c4075..94ed5c3 100644
18 --- a/00000_index.txt
19 +++ b/00000_index.txt
20 @@ -1589,13 +1589,25 @@
21 @@ Also install static libs by ENABLE_STATIC_LIBS
22
23 @patch 20006_all_cmake_elib-percona-5.5.35.patch
24 -@ver 5.05.35.00 to 5.05.99.99
25 +@ver 5.05.35.00 to 5.05.35.99
26 +@pn percona-server
27 +@@ Add ELIBPATH to split client and embedded libs
28 +@@ Also install static libs by ENABLE_STATIC_LIBS
29 +
30 +@patch 20006_all_cmake_elib-percona-5.5.36.patch
31 +@ver 5.05.36.00 to 5.05.99.99
32 @pn percona-server
33 @@ Add ELIBPATH to split client and embedded libs
34 @@ Also install static libs by ENABLE_STATIC_LIBS
35
36 @patch 20006_all_cmake_elib-percona-5.6.15.patch
37 -@ver 5.06.15.00 to 5.06.99.99
38 +@ver 5.06.15.00 to 5.06.15.99
39 +@pn percona-server
40 +@@ Add ELIBPATH to split client and embedded libs
41 +@@ Also install static libs by ENABLE_STATIC_LIBS
42 +
43 +@patch 20006_all_cmake_elib-percona-5.6.16.patch
44 +@ver 5.06.16.00 to 5.06.99.99
45 @pn percona-server
46 @@ Add ELIBPATH to split client and embedded libs
47 @@ Also install static libs by ENABLE_STATIC_LIBS
48
49 diff --git a/20006_all_cmake_elib-percona-5.5.36.patch b/20006_all_cmake_elib-percona-5.5.36.patch
50 new file mode 100644
51 index 0000000..1536fc2
52 --- /dev/null
53 +++ b/20006_all_cmake_elib-percona-5.5.36.patch
54 @@ -0,0 +1,168 @@
55 +diff -ur mysql-old/cmake/install_layout.cmake mysql/cmake/install_layout.cmake
56 +--- mysql-old/cmake/install_layout.cmake 2014-01-20 00:14:06.581799638 -0100
57 ++++ mysql/cmake/install_layout.cmake 2014-01-20 00:15:27.647802721 -0100
58 +@@ -43,7 +43,8 @@
59 + # - INSTALL_SBINDIR (directory with mysqld)
60 + # - INSTALL_SCRIPTDIR (several scripts, rarely used)
61 + #
62 +-# - INSTALL_LIBDIR (directory with client end embedded libraries)
63 ++# - INSTALL_LIBDIR (directory with client libraries)
64 ++# - INSTALL_ELIBDIR (directory with embedded libraries)
65 + # - INSTALL_PLUGINDIR (directory for plugins)
66 + #
67 + # - INSTALL_INCLUDEDIR (directory for MySQL headers)
68 +@@ -117,6 +118,7 @@
69 + SET(INSTALL_SCRIPTDIR_STANDALONE "scripts")
70 + #
71 + SET(INSTALL_LIBDIR_STANDALONE "lib")
72 ++SET(INSTALL_ELIBDIR_STANDALONE "lib")
73 + SET(INSTALL_PLUGINDIR_STANDALONE "lib/mysql/plugin")
74 + #
75 + SET(INSTALL_INCLUDEDIR_STANDALONE "include")
76 +@@ -148,9 +150,11 @@
77 + #
78 + IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
79 + SET(INSTALL_LIBDIR_RPM "lib64")
80 ++ SET(INSTALL_ELIBDIR_RPM "lib64")
81 + SET(INSTALL_PLUGINDIR_RPM "lib64/mysql/plugin")
82 + ELSE()
83 + SET(INSTALL_LIBDIR_RPM "lib")
84 ++ SET(INSTALL_ELIBDIR_RPM "lib")
85 + SET(INSTALL_PLUGINDIR_RPM "lib/mysql/plugin")
86 + ENDIF()
87 + #
88 +@@ -178,6 +182,7 @@
89 + SET(INSTALL_SCRIPTDIR_DEB "scripts")
90 + #
91 + SET(INSTALL_LIBDIR_DEB "lib")
92 ++SET(INSTALL_ELIBDIR_DEB "lib")
93 + SET(INSTALL_PLUGINDIR_DEB "lib/mysql/plugin")
94 + #
95 + SET(INSTALL_INCLUDEDIR_DEB "include")
96 +@@ -204,6 +209,7 @@
97 + SET(INSTALL_SCRIPTDIR_SVR4 "scripts")
98 + #
99 + SET(INSTALL_LIBDIR_SVR4 "lib")
100 ++SET(INSTALL_ELIBDIR_SVR4 "lib")
101 + SET(INSTALL_PLUGINDIR_SVR4 "lib/plugin")
102 + #
103 + SET(INSTALL_INCLUDEDIR_SVR4 "include")
104 +@@ -234,7 +240,7 @@
105 + # Set INSTALL_FOODIR variables for chosen layout (for example, INSTALL_BINDIR
106 + # will be defined as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE
107 + # layout is chosen)
108 +-FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
109 ++FOREACH(var BIN SBIN LIB ELIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
110 + INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA PLUGINTEST)
111 + SET(INSTALL_${var}DIR ${INSTALL_${var}DIR_${INSTALL_LAYOUT}}
112 + CACHE STRING "${var} installation directory" ${FORCE})
113 +diff -ur mysql-old/cmake/libutils.cmake mysql/cmake/libutils.cmake
114 +--- mysql-old/cmake/libutils.cmake 2014-01-20 00:14:06.581799638 -0100
115 ++++ mysql/cmake/libutils.cmake 2014-01-20 00:15:27.647802721 -0100
116 +@@ -40,6 +40,8 @@
117 + # - MERGE_LIBRARIES(target [STATIC|SHARED|MODULE] [linklib1 .... linklibN]
118 + # [EXPORTS exported_func1 .... exported_func_N]
119 + # [OUTPUT_NAME output_name]
120 ++# [OUTPUT_DIR output_dir]
121 ++
122 + # This macro merges several static libraries into a single one or creates a shared
123 + # library from several convenience libraries
124 +
125 +@@ -214,7 +216,7 @@
126 + #)
127 + MACRO(MERGE_LIBRARIES)
128 + MYSQL_PARSE_ARGUMENTS(ARG
129 +- "EXPORTS;OUTPUT_NAME;COMPONENT"
130 ++ "EXPORTS;OUTPUT_NAME;COMPONENT;OUTPUT_DIR"
131 + "STATIC;SHARED;MODULE;NOINSTALL"
132 + ${ARGN}
133 + )
134 +@@ -265,7 +267,11 @@
135 + IF(ARG_COMPONENT)
136 + SET(COMP COMPONENT ${ARG_COMPONENT})
137 + ENDIF()
138 +- MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP})
139 ++ IF(ARG_OUTPUT_DIR)
140 ++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${ARG_OUTPUT_DIR}" ${COMP})
141 ++ ELSE()
142 ++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP})
143 ++ ENDIF()
144 + ENDIF()
145 + SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_INTERFACE_LIBRARIES "")
146 +
147 +diff -ur mysql-old/libmysql/CMakeLists.txt mysql/libmysql/CMakeLists.txt
148 +--- mysql-old/libmysql/CMakeLists.txt 2014-01-20 00:14:06.580799638 -0100
149 ++++ mysql/libmysql/CMakeLists.txt 2014-01-20 00:15:27.647802721 -0100
150 +@@ -163,9 +163,14 @@
151 + LIST(APPEND LIBS auth_win_client)
152 + ENDIF()
153 +
154 ++SET(INSTALL_STATIC_LIBS "")
155 ++IF(NOT ENABLE_STATIC_LIBS)
156 ++ SET(INSTALL_STATIC_LIBS "NOINSTALL")
157 ++ENDIF()
158 ++
159 + # Merge several convenience libraries into one big perconaserverclient
160 + # and link them together into shared library.
161 +-MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development)
162 ++MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development OUTPUT_DIR ${INSTALL_LIBDIR} ${INSTALL_STATIC_LIBS})
163 +
164 + # Visual Studio users need debug static library for debug projects
165 + INSTALL_DEBUG_SYMBOLS(clientlib)
166 +@@ -186,7 +191,9 @@
167 + SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION})
168 + ENDIF()
169 + ENDMACRO()
170 +- INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a perconaserverclient ${INSTALL_LIBDIR} Development)
171 ++ IF(ENABLE_STATIC_LIBS)
172 ++ INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a perconaserverclient ${INSTALL_LIBDIR} Development)
173 ++ ENDIF()
174 + ENDIF()
175 +
176 + IF(NOT DISABLE_SHARED)
177 +diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt
178 +--- mysql-old/libmysqld/CMakeLists.txt 2014-01-20 00:14:06.453799634 -0100
179 ++++ mysql/libmysqld/CMakeLists.txt 2014-01-20 00:25:46.375826250 -0100
180 +@@ -126,8 +126,13 @@
181 + ENDIF()
182 + ENDFOREACH()
183 +
184 ++SET(INSTALL_STATIC_LIBS "")
185 ++IF(NOT ENABLE_STATIC_LIBS)
186 ++ SET(INSTALL_STATIC_LIBS "NOINSTALL")
187 ++ENDIF()
188 ++
189 + MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS}
190 +- OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded)
191 ++ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded OUTPUT_DIR ${INSTALL_ELIBDIR} ${INSTALL_STATIC_LIBS})
192 +
193 + # Visual Studio users need debug static library
194 + IF(MSVC)
195 +@@ -135,12 +135,14 @@
196 + ENDIF()
197 +
198 + IF(UNIX)
199 +- INSTALL_DEBUG_TARGET(mysqlserver DESTINATION ${INSTALL_LIBDIR} RENAME
200 ++ INSTALL_DEBUG_TARGET(mysqlserver DESTINATION ${INSTALL_ELIBDIR} RENAME
201 + ${CMAKE_STATIC_LIBRARY_PREFIX}mysqld-debug)
202 + ENDIF()
203 +
204 + IF(NOT DISABLE_SHARED)
205 +- MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${CLIENT_API_FUNCTIONS})
206 ++ MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${CLIENT_API_FUNCTIONS}
207 ++ COMPONENT Embedded OUTPUT_DIR ${INSTALL_ELIBDIR})
208 ++
209 + IF(UNIX)
210 + # Name the shared library, handle versioning (provides same api as client library
211 + # hence the same version)
212 +--- mysql-old/libservices/CMakeLists.txt 2014-02-06 14:35:25.162325748 -0500
213 ++++ mysql/libservices/CMakeLists.txt 2014-02-06 14:36:20.051137978 -0500
214 +@@ -26,4 +26,6 @@
215 + my_thread_scheduler_service.c)
216 +
217 + ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
218 +-INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
219 ++IF(ENABLE_STATIC_LIBS)
220 ++ INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
221 ++ENDIF()
222 +
223
224 diff --git a/20006_all_cmake_elib-percona-5.6.16.patch b/20006_all_cmake_elib-percona-5.6.16.patch
225 new file mode 100644
226 index 0000000..608daad
227 --- /dev/null
228 +++ b/20006_all_cmake_elib-percona-5.6.16.patch
229 @@ -0,0 +1,173 @@
230 +diff -ur mysql-old/cmake/install_layout.cmake mysql/cmake/install_layout.cmake
231 +--- mysql-old/cmake/install_layout.cmake 2014-01-20 00:14:06.581799638 -0100
232 ++++ mysql/cmake/install_layout.cmake 2014-01-20 00:15:27.647802721 -0100
233 +@@ -43,7 +43,8 @@
234 + # - INSTALL_SBINDIR (directory with mysqld)
235 + # - INSTALL_SCRIPTDIR (several scripts, rarely used)
236 + #
237 +-# - INSTALL_LIBDIR (directory with client end embedded libraries)
238 ++# - INSTALL_LIBDIR (directory with client libraries)
239 ++# - INSTALL_ELIBDIR (directory with embedded libraries)
240 + # - INSTALL_PLUGINDIR (directory for plugins)
241 + #
242 + # - INSTALL_INCLUDEDIR (directory for MySQL headers)
243 +@@ -117,6 +118,7 @@
244 + SET(INSTALL_SCRIPTDIR_STANDALONE "scripts")
245 + #
246 + SET(INSTALL_LIBDIR_STANDALONE "lib")
247 ++SET(INSTALL_ELIBDIR_STANDALONE "lib")
248 + SET(INSTALL_PLUGINDIR_STANDALONE "lib/mysql/plugin")
249 + #
250 + SET(INSTALL_INCLUDEDIR_STANDALONE "include")
251 +@@ -148,9 +150,11 @@
252 + #
253 + IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
254 + SET(INSTALL_LIBDIR_RPM "lib64")
255 ++ SET(INSTALL_ELIBDIR_RPM "lib64")
256 + SET(INSTALL_PLUGINDIR_RPM "lib64/mysql/plugin")
257 + ELSE()
258 + SET(INSTALL_LIBDIR_RPM "lib")
259 ++ SET(INSTALL_ELIBDIR_RPM "lib")
260 + SET(INSTALL_PLUGINDIR_RPM "lib/mysql/plugin")
261 + ENDIF()
262 + #
263 +@@ -178,6 +182,7 @@
264 + SET(INSTALL_SCRIPTDIR_DEB "scripts")
265 + #
266 + SET(INSTALL_LIBDIR_DEB "lib")
267 ++SET(INSTALL_ELIBDIR_DEB "lib")
268 + SET(INSTALL_PLUGINDIR_DEB "lib/mysql/plugin")
269 + #
270 + SET(INSTALL_INCLUDEDIR_DEB "include")
271 +@@ -204,6 +209,7 @@
272 + SET(INSTALL_SCRIPTDIR_SVR4 "scripts")
273 + #
274 + SET(INSTALL_LIBDIR_SVR4 "lib")
275 ++SET(INSTALL_ELIBDIR_SVR4 "lib")
276 + SET(INSTALL_PLUGINDIR_SVR4 "lib/plugin")
277 + #
278 + SET(INSTALL_INCLUDEDIR_SVR4 "include")
279 +@@ -234,7 +240,7 @@
280 + # Set INSTALL_FOODIR variables for chosen layout (for example, INSTALL_BINDIR
281 + # will be defined as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE
282 + # layout is chosen)
283 +-FOREACH(var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
284 ++FOREACH(var BIN SBIN LIB ELIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
285 + INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA PLUGINTEST)
286 + SET(INSTALL_${var}DIR ${INSTALL_${var}DIR_${INSTALL_LAYOUT}}
287 + CACHE STRING "${var} installation directory" ${FORCE})
288 +diff -ur mysql-old/cmake/libutils.cmake mysql/cmake/libutils.cmake
289 +--- mysql-old/cmake/libutils.cmake 2014-01-20 00:14:06.581799638 -0100
290 ++++ mysql/cmake/libutils.cmake 2014-01-20 00:15:27.647802721 -0100
291 +@@ -40,6 +40,8 @@
292 + # - MERGE_LIBRARIES(target [STATIC|SHARED|MODULE] [linklib1 .... linklibN]
293 + # [EXPORTS exported_func1 .... exported_func_N]
294 + # [OUTPUT_NAME output_name]
295 ++# [OUTPUT_DIR output_dir]
296 ++
297 + # This macro merges several static libraries into a single one or creates a shared
298 + # library from several convenience libraries
299 +
300 +@@ -214,7 +216,7 @@
301 + #)
302 + MACRO(MERGE_LIBRARIES)
303 + MYSQL_PARSE_ARGUMENTS(ARG
304 +- "EXPORTS;OUTPUT_NAME;COMPONENT"
305 ++ "EXPORTS;OUTPUT_NAME;COMPONENT;OUTPUT_DIR"
306 + "STATIC;SHARED;MODULE;NOINSTALL"
307 + ${ARGN}
308 + )
309 +@@ -265,7 +267,11 @@
310 + IF(ARG_COMPONENT)
311 + SET(COMP COMPONENT ${ARG_COMPONENT})
312 + ENDIF()
313 +- MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP})
314 ++ IF(ARG_OUTPUT_DIR)
315 ++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${ARG_OUTPUT_DIR}" ${COMP})
316 ++ ELSE()
317 ++ MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP})
318 ++ ENDIF()
319 + ENDIF()
320 + SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_INTERFACE_LIBRARIES "")
321 +
322 +diff -ur mysql-old/libmysql/CMakeLists.txt mysql/libmysql/CMakeLists.txt
323 +--- mysql-old/libmysql/CMakeLists.txt 2014-01-20 00:14:06.580799638 -0100
324 ++++ mysql/libmysql/CMakeLists.txt 2014-01-20 00:15:27.647802721 -0100
325 +@@ -179,8 +179,13 @@
326 + LIST(APPEND LIBS auth_win_client)
327 + ENDIF()
328 +
329 ++SET(INSTALL_STATIC_LIBS "")
330 ++IF(NOT ENABLE_STATIC_LIBS)
331 ++ SET(INSTALL_STATIC_LIBS "NOINSTALL")
332 ++ENDIF()
333 ++
334 + # Merge several convenience libraries into one big perconaserverclient
335 +-MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development)
336 ++MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development OUTPUT_DIR ${INSTALL_LIBDIR} $INSTALL_STATIC_LIBS})
337 +
338 + # Visual Studio users need debug static library for debug projects
339 + INSTALL_DEBUG_SYMBOLS(clientlib)
340 +@@ -210,10 +215,12 @@
341 + ENDIF()
342 +
343 + IF(UNIX)
344 +- GET_TARGET_NAME(perconaserverclient lib_name)
345 +- INSTALL_SYMLINK(perconaserverclient
346 +- ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a
347 +- ${INSTALL_LIBDIR} Development)
348 ++ GET_TARGET_NAME(perconaserverclient lib_name)\
349 ++ IF(ENABLE_STATIC_LIBS)
350 ++ INSTALL_SYMLINK(perconaserverclient
351 ++ ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a
352 ++ ${INSTALL_LIBDIR} Development)
353 ++ ENDIF()
354 + ENDIF()
355 +
356 + IF(NOT DISABLE_SHARED)
357 +diff -ur mysql-old/libmysqld/CMakeLists.txt mysql/libmysqld/CMakeLists.txt
358 +--- mysql-old/libmysqld/CMakeLists.txt 2014-01-20 00:14:06.453799634 -0100
359 ++++ mysql/libmysqld/CMakeLists.txt 2014-01-20 00:25:46.375826250 -0100
360 +@@ -126,8 +126,13 @@
361 + ENDIF()
362 + ENDFOREACH()
363 +
364 ++SET(INSTALL_STATIC_LIBS "")
365 ++IF(NOT ENABLE_STATIC_LIBS)
366 ++ SET(INSTALL_STATIC_LIBS "NOINSTALL")
367 ++ENDIF()
368 ++
369 + MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS}
370 +- OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded)
371 ++ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded OUTPUT_DIR ${INSTALL_ELIBDIR} ${INSTALL_STATIC_LIBS})
372 +
373 + # Visual Studio users need debug static library
374 + IF(MSVC)
375 +@@ -135,12 +135,14 @@
376 + ENDIF()
377 +
378 + IF(UNIX)
379 +- INSTALL_DEBUG_TARGET(mysqlserver DESTINATION ${INSTALL_LIBDIR} RENAME
380 ++ INSTALL_DEBUG_TARGET(mysqlserver DESTINATION ${INSTALL_ELIBDIR} RENAME
381 + ${CMAKE_STATIC_LIBRARY_PREFIX}mysqld-debug)
382 + ENDIF()
383 +
384 + IF(NOT DISABLE_SHARED)
385 +- MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${CLIENT_API_FUNCTIONS})
386 ++ MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${CLIENT_API_FUNCTIONS}
387 ++ COMPONENT Embedded OUTPUT_DIR ${INSTALL_ELIBDIR})
388 ++
389 + IF(UNIX)
390 + # Name the shared library, handle versioning (provides same api as client library
391 + # hence the same version)
392 +--- mysql-old/libservices/CMakeLists.txt 2014-02-06 14:35:25.162325748 -0500
393 ++++ mysql/libservices/CMakeLists.txt 2014-02-06 14:36:20.051137978 -0500
394 +@@ -26,4 +26,6 @@
395 + my_thread_scheduler_service.c)
396 +
397 + ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
398 +-INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
399 ++IF(ENABLE_STATIC_LIBS)
400 ++ INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
401 ++ENDIF()
402 +
Report Message
Find on MARC Find on Google Groups