diff options
| author | Vladislav Vaintroub <wlad@localhost.localdomain> | 2011-11-08 02:14:57 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@localhost.localdomain> | 2011-11-08 02:14:57 +0100 |
| commit | c104d31404c68b5622dc676d53308d02349755d1 (patch) | |
| tree | fc27ff74b43e14f071b523f99fa94475f70bd287 /libmysqld | |
| parent | 216d5450e7b3f8455175c586b6fe73c0825dd89b (diff) | |
| download | mariadb-git-c104d31404c68b5622dc676d53308d02349755d1.tar.gz | |
For libmysqld.so, apply patch to the MySQL Bug#39288 found here
http://lists.mysql.com/commits/102373
It is better than previous attempts to build the libmysqld,
as it also takes care of
1) -Wl,--no-undefined for shared libraries and
2) CLEAN_DIRECT_OUTPUT since there are now 2 libraries with
the same base output name
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index b23b4fdab5f..9bafd7bad49 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -147,6 +147,17 @@ ENDIF() IF(NOT DISABLE_SHARED) MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${CLIENT_API_FUNCTIONS} - COMPONENT Embedded VERSION ${SHARED_LIB_MAJOR_VERSION}) - SET_TARGET_PROPERTIES(libmysqld PROPERTIES PREFIX "") + COMPONENT Embedded) + IF(UNIX) + # Name the shared library, handle versioning (provides same api as client + # library hence the same version) + SET_TARGET_PROPERTIES(libmysqld PROPERTIES + OUTPUT_NAME mysqld + SOVERSION "${SHARED_LIB_MAJOR_VERSION}") + # Clean direct output flags, as 2 targets have the same base name + # libmysqld + SET_TARGET_PROPERTIES(libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1) + SET_TARGET_PROPERTIES(mysqlserver PROPERTIES CLEAN_DIRECT_OUTPUT 1) + ENDIF() ENDIF() + |