diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 23:39:53 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 23:39:53 +0100 |
| commit | 6edd76785c2fff55f1869ef816da13a8bab6151d (patch) | |
| tree | c987eb9a81d19b6544fc6688632bedd80f7622d1 /libmysqld | |
| parent | 0e007344eae972b9be7d88ca43373cb33662ac1c (diff) | |
| parent | 11400de10cdfa9047904539fb9e7fbff611d9391 (diff) | |
| download | mariadb-git-6edd76785c2fff55f1869ef816da13a8bab6151d.tar.gz | |
merge
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index f45a03cdb19..2b3b9b4347f 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -113,7 +113,7 @@ ENDIF() SET(LIBS - ${DBUG_LIBRARY} strings regex mysys vio + dbug strings regex mysys vio ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBWRAP} ${LIBCRYPT} ${LIBDL} ${MYSQLD_STATIC_PLUGIN_LIBS} @@ -145,7 +145,8 @@ IF(UNIX) ${CMAKE_STATIC_LIBRARY_PREFIX}mysqld-debug) ENDIF() -IF(MSVC AND NOT DISABLE_SHARED) +IF(NOT DISABLE_SHARED) MERGE_LIBRARIES(libmysqld SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT Embedded) + SET_TARGET_PROPERTIES(libmysqld PROPERTIES PREFIX "") ENDIF() |