diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-08-12 15:56:36 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-08-12 15:56:36 +0300 |
| commit | 9cb18248a7d1c6006cdaf064f77ad52b47d05c99 (patch) | |
| tree | 35199fdddecca26e9265782d55f6c9fa8f40f921 | |
| parent | e60bbfff608bb89c83f2930a5af15f2721346860 (diff) | |
| download | mariadb-git-9cb18248a7d1c6006cdaf064f77ad52b47d05c99.tar.gz | |
re-commit of Bug #11765565: 58548: 5.5.X NEEDS TO LINK TO THE CORESERVICES
FRAMEWORK FOR SOME PLUGINS TO WORK
to the 5.5.16 release clone.
| -rw-r--r-- | sql/CMakeLists.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index f95cc359439..fb86d1ce60f 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -100,6 +100,14 @@ ENDIF() MYSQL_ADD_EXECUTABLE(mysqld ${MYSQLD_SOURCE} DESTINATION ${INSTALL_SBINDIR} COMPONENT Server) +IF(APPLE) + # Add CoreServices framework since some dloadable plugins may need it + FIND_LIBRARY(CORESERVICES NAMES CoreServices) + IF(CORESERVICES) + TARGET_LINK_LIBRARIES(mysqld ${CORESERVICES}) + ENDIF() +ENDIF() + IF(NOT WITHOUT_DYNAMIC_PLUGINS) SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) GET_TARGET_PROPERTY(mysqld_link_flags mysqld LINK_FLAGS) |