Lines 1-12
Link Here
|
1 |
--- cmake/plugin.cmake.orig 2016-03-28 18:06:12 UTC |
1 |
--- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC |
2 |
+++ cmake/plugin.cmake |
2 |
+++ cmake/plugin.cmake |
3 |
@@ -237,9 +237,6 @@ MACRO(MYSQL_ADD_PLUGIN) |
3 |
@@ -219,9 +219,16 @@ MACRO(MYSQL_ADD_PLUGIN) |
|
|
4 |
# Thus we skip TARGET_LINK_LIBRARIES on Linux, as it would only generate |
5 |
# an additional dependency. |
6 |
# Use MYSQL_PLUGIN_IMPORT for static data symbols to be exported. |
7 |
- IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") |
8 |
+ # |
9 |
+ # P.S. "FreeBSD" is obviously not "Linux" but it behaves near similar in this case. |
10 |
+ IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") |
11 |
TARGET_LINK_LIBRARIES (${target} mysqld ${ARG_LINK_LIBRARIES}) |
12 |
ENDIF() |
13 |
+ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") |
14 |
+ SET_TARGET_PROPERTIES(${target} PROPERTIES |
15 |
+ LINK_FLAGS "-L%%FREEBSD_LOCAL_LIB%% ${LINK_FLAGS} " |
16 |
+ ) |
17 |
+ ENDIF() |
18 |
ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES}) |
19 |
|
20 |
IF(NOT ARG_MODULE_ONLY) |
21 |
@@ -239,13 +246,17 @@ MACRO(MYSQL_ADD_PLUGIN) |
4 |
MYSQL_INSTALL_TARGETS(${target} |
22 |
MYSQL_INSTALL_TARGETS(${target} |
5 |
DESTINATION ${INSTALL_PLUGINDIR} |
23 |
DESTINATION ${INSTALL_PLUGINDIR} |
6 |
COMPONENT ${INSTALL_COMPONENT}) |
24 |
COMPONENT ${INSTALL_COMPONENT}) |
7 |
- INSTALL_DEBUG_TARGET(${target} |
25 |
- INSTALL_DEBUG_TARGET(${target} |
8 |
- DESTINATION ${INSTALL_PLUGINDIR}/debug |
26 |
- DESTINATION ${INSTALL_PLUGINDIR}/debug |
9 |
- COMPONENT ${INSTALL_COMPONENT}) |
27 |
- COMPONENT ${INSTALL_COMPONENT}) |
|
|
28 |
+ IF(CMAKE_BUILD_TYPE MATCHES "Debug") |
29 |
+ INSTALL_DEBUG_TARGET(${target} |
30 |
+ DESTINATION ${INSTALL_PLUGINDIR}/debug |
31 |
+ COMPONENT ${INSTALL_COMPONENT}) |
32 |
+ # Add installed files to list for RPMs |
33 |
+ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files |
34 |
+ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") |
35 |
+ ENDIF() |
10 |
# Add installed files to list for RPMs |
36 |
# Add installed files to list for RPMs |
11 |
FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files |
37 |
FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files |
12 |
"%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" |
38 |
- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" |
|
|
39 |
- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") |
40 |
+ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n") |
41 |
# For internal testing in PB2, append collections files |
42 |
IF(DEFINED ENV{PB2WORKDIR}) |
43 |
PLUGIN_APPEND_COLLECTIONS(${plugin}) |